X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=snaps%2Fopenstack%2Ftests%2Fos_source_file_test.py;h=bd98ad3a80c123cee76a6f292f1dfb0c0e092507;hb=refs%2Fchanges%2F39%2F58439%2F2;hp=c632e02680a539022e37a4c7361b2bc61bef228f;hpb=d3be4ce4c62700ec6a84abb160d9f59e7a5c4b0d;p=snaps.git diff --git a/snaps/openstack/tests/os_source_file_test.py b/snaps/openstack/tests/os_source_file_test.py index c632e02..bd98ad3 100644 --- a/snaps/openstack/tests/os_source_file_test.py +++ b/snaps/openstack/tests/os_source_file_test.py @@ -63,7 +63,13 @@ class OSComponentTestCase(unittest.TestCase): test_conf = file_utils.read_yaml(dev_os_env_file) self.ext_net_name = test_conf.get('ext_net') - self.flavor_metadata = flavor_metadata + if flavor_metadata: + self.flavor_metadata = flavor_metadata + else: + os_env_dict = file_utils.read_yaml(dev_os_env_file) + flavor_metadata = os_env_dict.get('flavor_metadata') + if flavor_metadata: + self.flavor_metadata = {'metadata': flavor_metadata} self.image_metadata = image_metadata @staticmethod