Fix up xenapi tests for instance flavors
Fix up xenapi tests for instance flavors

This is in preparation for dropping the flavor compat support.

Change-Id: Ie52d3de12da9fbc1148f0951c866f1e8b7b2412a

TwinkleChawla/nova,alaski/nova,phenoxim/nova,yosshy/nova,gooddata/openstack-nova,devendermishrajio/nova_test_latest,cernops/nova,j-carpentier/nova,whitepages/nova,ted-gould/nova,Juniper/nova,gooddata/openstack-nova,noironetworks/nova,alaski/nova,zaina/nova,mikalstill/nova,mandeepdhami/nova,CloudServer/nova,jeffrey4l/nova,cyx1231st/nova,gooddata/openstack-nova,devendermishrajio/nova,kimjaejoong/nova,mikalstill/nova,Stavitsky/nova,akash1808/nova_test_latest,CCI-MOC/nova,iuliat/nova,scripnichenko/nova,watonyweng/nova,nikesh-mahalka/nova,MountainWei/nova,klmitch/nova,openstack/nova,CEG-FYP-OpenStack/scheduler,edulramirez/nova,openstack/nova,apporc/nova,tudorvio/nova,jeffrey4l/nova,rajalokan/nova,ruslanloman/nova,klmitch/nova,bigswitch/nova,LoHChina/nova,rahulunair/nova,CCI-MOC/nova,devendermishrajio/nova,scripnichenko/nova,JioCloud/nova_test_latest,barnsnake351/nova,dims/nova,Francis-Liu/animated-broccoli,jianghuaw/nova,varunarya10/nova_test_latest,zzicewind/nova,belmiromoreira/nova,mikalstill/nova,mandeepdhami/nova,NeCTAR-RC/nova,edulramirez/nova,apporc/nova,Juniper/nova,mmnelemane/nova,barnsnake351/nova,vmturbo/nova,yatinkumbhare/openstack-nova,felixma/nova,sebrandon1/nova,klmitch/nova,eonpatapon/nova,cyx1231st/nova,whitepages/nova,cloudbase/nova,zhimin711/nova,Francis-Liu/animated-broccoli,kimjaejoong/nova,akash1808/nova_test_latest,j-carpentier/nova,tudorvio/nova,TwinkleChawla/nova,yatinkumbhare/openstack-nova,sebrandon1/nova,vmturbo/nova,JianyuWang/nova,nikesh-mahalka/nova,CloudServer/nova,cernops/nova,zhimin711/nova,NeCTAR-RC/nova,phenoxim/nova,dims/nova,isyippee/nova,BeyondTheClouds/nova,hanlind/nova,belmiromoreira/nova,hanlind/nova,BeyondTheClouds/nova,watonyweng/nova,devendermishrajio/nova_test_latest,jianghuaw/nova,Tehsmash/nova,openstack/nova,takeshineshiro/nova,shail2810/nova,rajalokan/nova,MountainWei/nova,fnordahl/nova,klmitch/nova,ruslanloman/nova,rajalokan/nova,raildo/nova,vmturbo/nova,jianghuaw/nova,fnordahl/nova,Stavitsky/nova,Tehsmash/nova,rahulunair/nova,felixma/nova,JioCloud/nova_test_latest,jianghuaw/nova,mmnelemane/nova,mahak/nova,raildo/nova,zaina/nova,bigswitch/nova,rahulunair/nova,iuliat/nova,JianyuWang/nova,cloudbase/nova,cloudbase/nova,vmturbo/nova,takeshineshiro/nova,noironetworks/nova,rajalokan/nova,cernops/nova,zzicewind/nova,Juniper/nova,ted-gould/nova,Juniper/nova,sebrandon1/nova,hanlind/nova,isyippee/nova,mahak/nova,gooddata/openstack-nova,CEG-FYP-OpenStack/scheduler,yosshy/nova,mahak/nova,shail2810/nova,LoHChina/nova,BeyondTheClouds/nova,varunarya10/nova_test_latest,eonpatapon/nova