Fixes a test failure in master
Fixes a test failure in master

Fixes bug 861691

Problem is likely due to python version.. 'with self.AssertRaises' not
supported?

Change-Id: Ida0bf74ea20ae1b4b3a25a3e1cb9d58ac51f24c8

belmiromoreira/nova,jianghuaw/nova,sridevikoushik31/nova,tianweizhang/nova,watonyweng/nova,sridevikoushik31/nova,angdraug/nova,luogangyi/bcec-nova,double12gzh/nova,devendermishrajio/nova,eharney/nova,bclau/nova,viggates/nova,Yusuke1987/openstack_template,petrutlucian94/nova_dev,nikesh-mahalka/nova,yrobla/nova,openstack/nova,Metaswitch/calico-nova,aristanetworks/arista-ovs-nova,takeshineshiro/nova,noironetworks/nova,klmitch/nova,yatinkumbhare/openstack-nova,scripnichenko/nova,usc-isi/nova,vladikr/nova_drafts,JioCloud/nova,Tehsmash/nova,Tehsmash/nova,Francis-Liu/animated-broccoli,tianweizhang/nova,qwefi/nova,DirectXMan12/nova-hacking,Brocade-OpenSource/OpenStack-DNRM-Nova,gooddata/openstack-nova,phenoxim/nova,yatinkumbhare/openstack-nova,jianghuaw/nova,citrix-openstack-build/nova,angdraug/nova,MountainWei/nova,hanlind/nova,devendermishrajio/nova,zzicewind/nova,eayunstack/nova,phenoxim/nova,dstroppa/openstack-smartos-nova-grizzly,BeyondTheClouds/nova,mahak/nova,BeyondTheClouds/nova,paulmathews/nova,raildo/nova,MountainWei/nova,adelina-t/nova,sileht/deb-openstack-nova,houshengbo/nova_vmware_compute_driver,tanglei528/nova,tudorvio/nova,salv-orlando/MyRepo,Yusuke1987/openstack_template,KarimAllah/nova,berrange/nova,OpenAcademy-OpenStack/nova-scheduler,eayunstack/nova,joker946/nova,akash1808/nova,vmturbo/nova,mikalstill/nova,josephsuh/extra-specs,ewindisch/nova,watonyweng/nova,alaski/nova,j-carpentier/nova,NeCTAR-RC/nova,Stavitsky/nova,takeshineshiro/nova,vmturbo/nova,Triv90/Nova,barnsnake351/nova,mandeepdhami/nova,paulmathews/nova,mandeepdhami/nova,redhat-openstack/nova,JioCloud/nova,maheshp/novatest,kimjaejoong/nova,cloudbase/nova-virtualbox,kimjaejoong/nova,Yuriy-Leonov/nova,berrange/nova,NewpTone/stacklab-nova,usc-isi/extra-specs,dawnpower/nova,devoid/nova,leilihh/nova,ntt-sic/nova,ruslanloman/nova,psiwczak/openstack,double12gzh/nova,bigswitch/nova,akash1808/nova_test_latest,Metaswitch/calico-nova,aristanetworks/arista-ovs-nova,fajoy/nova,mmnelemane/nova,akash1808/nova,vmturbo/nova,alexandrucoman/vbox-nova-driver,Brocade-OpenSource/OpenStack-DNRM-Nova,cernops/nova,Stavitsky/nova,sacharya/nova,virtualopensystems/nova,Juniper/nova,imsplitbit/nova,maheshp/novatest,virtualopensystems/nova,NoBodyCam/TftpPxeBootBareMetal,cloudbase/nova,alvarolopez/nova,NewpTone/stacklab-nova,whitepages/nova,devendermishrajio/nova_test_latest,tangfeixiong/nova,gooddata/openstack-nova,sebrandon1/nova,gspilio/nova,TwinkleChawla/nova,rajalokan/nova,TwinkleChawla/nova,rrader/nova-docker-plugin,DirectXMan12/nova-hacking,leilihh/novaha,DirectXMan12/nova-hacking,gspilio/nova,openstack/nova,Juniper/nova,belmiromoreira/nova,thomasem/nova,citrix-openstack-build/nova,ntt-sic/nova,viggates/nova,mgagne/nova,badock/nova,JianyuWang/nova,KarimAllah/nova,affo/nova,russellb/nova,JioCloud/nova_test_latest,thomasem/nova,projectcalico/calico-nova,felixma/nova,maoy/zknova,OpenAcademy-OpenStack/nova-scheduler,redhat-openstack/nova,isyippee/nova,NeCTAR-RC/nova,tanglei528/nova,isyippee/nova,Yuriy-Leonov/nova,cloudbase/nova,sridevikoushik31/nova,noironetworks/nova,silenceli/nova,usc-isi/nova,JianyuWang/nova,rajalokan/nova,rajalokan/nova,jianghuaw/nova,iuliat/nova,ewindisch/nova,imsplitbit/nova,usc-isi/nova,BeyondTheClouds/nova,sridevikoushik31/openstack,mgagne/nova,shootstar/novatest,jeffrey4l/nova,josephsuh/extra-specs,joker946/nova,dims/nova,cloudbase/nova,CEG-FYP-OpenStack/scheduler,houshengbo/nova_vmware_compute_driver,rahulunair/nova,ruslanloman/nova,tudorvio/nova,projectcalico/calico-nova,TieWei/nova,zaina/nova,vladikr/nova_drafts,sebrandon1/nova,spring-week-topos/nova-week,varunarya10/nova_test_latest,sridevikoushik31/nova,LoHChina/nova,spring-week-topos/nova-week,paulmathews/nova,alexandrucoman/vbox-nova-driver,cyx1231st/nova,tealover/nova,devoid/nova,leilihh/nova,leilihh/novaha,CCI-MOC/nova,psiwczak/openstack,maoy/zknova,TieWei/nova,mahak/nova,sridevikoushik31/openstack,hanlind/nova,yrobla/nova,sileht/deb-openstack-nova,CloudServer/nova,NoBodyCam/TftpPxeBootBareMetal,gooddata/openstack-nova,CloudServer/nova,cernops/nova,saleemjaveds/https-github.com-openstack-nova,maheshp/novatest,zhimin711/nova,saleemjaveds/https-github.com-openstack-nova,CEG-FYP-OpenStack/scheduler,silenceli/nova,savi-dev/nova,zhimin711/nova,savi-dev/nova,fajoy/nova,cernops/nova,yosshy/nova,sridevikoushik31/openstack,scripnichenko/nova,houshengbo/nova_vmware_compute_driver,salv-orlando/MyRepo,NewpTone/stacklab-nova,josephsuh/extra-specs,iuliat/nova,whitepages/nova,alaski/nova,klmitch/nova,eneabio/nova,mahak/nova,eharney/nova,shahar-stratoscale/nova,usc-isi/extra-specs,badock/nova,devendermishrajio/nova_test_latest,cloudbau/nova,sileht/deb-openstack-nova,rahulunair/nova,tangfeixiong/nova,klmitch/nova,klmitch/nova,cloudbase/nova-virtualbox,sacharya/nova,mikalstill/nova,bclau/nova,maelnor/nova,aristanetworks/arista-ovs-nova,sebrandon1/nova,blueboxgroup/nova,SUSE-Cloud/nova,maelnor/nova,petrutlucian94/nova_dev,edulramirez/nova,rickerc/nova_audit,eonpatapon/nova,psiwczak/openstack,NoBodyCam/TftpPxeBootBareMetal,rickerc/nova_audit,rajalokan/nova,ted-gould/nova,SUSE-Cloud/nova,Triv90/Nova,CCI-MOC/nova,vmturbo/nova,fajoy/nova,zzicewind/nova,jeffrey4l/nova,varunarya10/nova_test_latest,Juniper/nova,orbitfp7/nova,CiscoSystems/nova,felixma/nova,eneabio/nova,shail2810/nova,raildo/nova,eneabio/nova,ted-gould/nova,cloudbau/nova,eonpatapon/nova,edulramirez/nova,bgxavier/nova,fnordahl/nova,bigswitch/nova,dawnpower/nova,apporc/nova,plumgrid/plumgrid-nova,luogangyi/bcec-nova,petrutlucian94/nova,mmnelemane/nova,rrader/nova-docker-plugin,KarimAllah/nova,russellb/nova,gooddata/openstack-nova,shahar-stratoscale/nova,gspilio/nova,barnsnake351/nova,affo/nova,tealover/nova,LoHChina/nova,blueboxgroup/nova,yrobla/nova,nikesh-mahalka/nova,alvarolopez/nova,openstack/nova,apporc/nova,usc-isi/extra-specs,Triv90/Nova,orbitfp7/nova,russellb/nova,dstroppa/openstack-smartos-nova-grizzly,shootstar/novatest,savi-dev/nova,maoy/zknova,dstroppa/openstack-smartos-nova-grizzly,akash1808/nova_test_latest,hanlind/nova,Juniper/nova,yosshy/nova,bgxavier/nova,j-carpentier/nova,qwefi/nova,cyx1231st/nova,shail2810/nova,CiscoSystems/nova,rahulunair/nova,dims/nova,plumgrid/plumgrid-nova,zaina/nova,fnordahl/nova,petrutlucian94/nova,jianghuaw/nova,adelina-t/nova,JioCloud/nova_test_latest,mikalstill/nova,salv-orlando/MyRepo,Francis-Liu/animated-broccoli