Fix logic in LibvirtConnTestCase._check_xml_and_uri
Fix logic in LibvirtConnTestCase._check_xml_and_uri

The _check_xml_and_uri method has two loops making it
iterate over different hypervisor types. By default it
will iterate over qemu, kvm, xen and lxc, but it can be
made to only check xen by setting the 'xen_only' param
or the 'expect_xen_hvm' parameters.

Unfortunately the second loop is only filtered if the
'expect_xen_hvm' parameter is set, not if only the
'xen_only' parameter is set. This flaw hasn't showed
up before, due to a flaw elsewhere in the libvirt
driver code, cancelling it out.

Change-Id: If70faa05975b726067ab6edaa505ca8d0c230a38
Signed-off-by: Daniel P. Berrange <bb938cf255e055ff3507f2627d214e8e62118fcf@redhat.com>

cloudbase/nova,mmnelemane/nova,eayunstack/nova,edulramirez/nova,vladikr/nova_drafts,jianghuaw/nova,CEG-FYP-OpenStack/scheduler,eharney/nova,mgagne/nova,tudorvio/nova,Stavitsky/nova,barnsnake351/nova,petrutlucian94/nova,raildo/nova,noironetworks/nova,zaina/nova,petrutlucian94/nova_dev,CCI-MOC/nova,vladikr/nova_drafts,gooddata/openstack-nova,affo/nova,mandeepdhami/nova,ruslanloman/nova,OpenAcademy-OpenStack/nova-scheduler,TwinkleChawla/nova,double12gzh/nova,Stavitsky/nova,watonyweng/nova,viggates/nova,tudorvio/nova,hanlind/nova,maelnor/nova,luogangyi/bcec-nova,CloudServer/nova,jianghuaw/nova,LoHChina/nova,openstack/nova,akash1808/nova,raildo/nova,rahulunair/nova,edulramirez/nova,j-carpentier/nova,sacharya/nova,rahulunair/nova,joker946/nova,eayunstack/nova,NeCTAR-RC/nova,dims/nova,CiscoSystems/nova,silenceli/nova,saleemjaveds/https-github.com-openstack-nova,vmturbo/nova,mikalstill/nova,noironetworks/nova,CloudServer/nova,gooddata/openstack-nova,akash1808/nova,fnordahl/nova,eonpatapon/nova,jianghuaw/nova,devoid/nova,felixma/nova,Juniper/nova,dawnpower/nova,cernops/nova,fnordahl/nova,orbitfp7/nova,Francis-Liu/animated-broccoli,takeshineshiro/nova,badock/nova,leilihh/novaha,NeCTAR-RC/nova,Francis-Liu/animated-broccoli,ted-gould/nova,angdraug/nova,whitepages/nova,sebrandon1/nova,Yusuke1987/openstack_template,varunarya10/nova_test_latest,bgxavier/nova,LoHChina/nova,viggates/nova,blueboxgroup/nova,Juniper/nova,JioCloud/nova,BeyondTheClouds/nova,thomasem/nova,Metaswitch/calico-nova,virtualopensystems/nova,CEG-FYP-OpenStack/scheduler,akash1808/nova_test_latest,spring-week-topos/nova-week,vmturbo/nova,kimjaejoong/nova,JianyuWang/nova,akash1808/nova_test_latest,cloudbase/nova-virtualbox,tealover/nova,OpenAcademy-OpenStack/nova-scheduler,cloudbase/nova-virtualbox,petrutlucian94/nova,j-carpentier/nova,rrader/nova-docker-plugin,BeyondTheClouds/nova,alexandrucoman/vbox-nova-driver,tianweizhang/nova,zzicewind/nova,rajalokan/nova,Tehsmash/nova,varunarya10/nova_test_latest,mikalstill/nova,tangfeixiong/nova,alvarolopez/nova,luogangyi/bcec-nova,sebrandon1/nova,devendermishrajio/nova_test_latest,tianweizhang/nova,barnsnake351/nova,Metaswitch/calico-nova,rajalokan/nova,eharney/nova,Yusuke1987/openstack_template,redhat-openstack/nova,tanglei528/nova,double12gzh/nova,bgxavier/nova,petrutlucian94/nova_dev,devendermishrajio/nova_test_latest,TwinkleChawla/nova,shahar-stratoscale/nova,cloudbase/nova,isyippee/nova,JioCloud/nova_test_latest,belmiromoreira/nova,whitepages/nova,cloudbase/nova,devendermishrajio/nova,leilihh/nova,eonpatapon/nova,mandeepdhami/nova,BeyondTheClouds/nova,isyippee/nova,mmnelemane/nova,MountainWei/nova,JioCloud/nova_test_latest,zzicewind/nova,scripnichenko/nova,JianyuWang/nova,virtualopensystems/nova,Tehsmash/nova,openstack/nova,iuliat/nova,projectcalico/calico-nova,JioCloud/nova,mgagne/nova,sacharya/nova,rajalokan/nova,jeffrey4l/nova,ewindisch/nova,ted-gould/nova,CiscoSystems/nova,dims/nova,hanlind/nova,iuliat/nova,openstack/nova,apporc/nova,devoid/nova,silenceli/nova,zaina/nova,alvarolopez/nova,yatinkumbhare/openstack-nova,phenoxim/nova,affo/nova,ewindisch/nova,cernops/nova,kimjaejoong/nova,takeshineshiro/nova,jeffrey4l/nova,joker946/nova,cyx1231st/nova,vmturbo/nova,mahak/nova,sebrandon1/nova,berrange/nova,cernops/nova,thomasem/nova,devendermishrajio/nova,shail2810/nova,alaski/nova,vmturbo/nova,orbitfp7/nova,belmiromoreira/nova,yatinkumbhare/openstack-nova,yosshy/nova,mahak/nova,tealover/nova,dawnpower/nova,berrange/nova,alexandrucoman/vbox-nova-driver,Juniper/nova,shail2810/nova,maelnor/nova,ruslanloman/nova,Juniper/nova,hanlind/nova,gooddata/openstack-nova,blueboxgroup/nova,spring-week-topos/nova-week,zhimin711/nova,projectcalico/calico-nova,shahar-stratoscale/nova,watonyweng/nova,apporc/nova,rajalokan/nova,scripnichenko/nova,gooddata/openstack-nova,klmitch/nova,nikesh-mahalka/nova,leilihh/nova,CCI-MOC/nova,yosshy/nova,phenoxim/nova,mahak/nova,felixma/nova,jianghuaw/nova,MountainWei/nova,angdraug/nova,alaski/nova,klmitch/nova,rahulunair/nova,klmitch/nova,tangfeixiong/nova,mikalstill/nova,adelina-t/nova,leilihh/novaha,redhat-openstack/nova,tanglei528/nova,zhimin711/nova,cyx1231st/nova,nikesh-mahalka/nova,bigswitch/nova,rrader/nova-docker-plugin,saleemjaveds/https-github.com-openstack-nova,adelina-t/nova,bigswitch/nova,klmitch/nova,badock/nova