From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 13 Jun 2018 12:19:24 +0000 (+0200)
Subject: Check dev_os_env_file exists before loading it
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cdcf4e4b977ad2a7ccbe18d99302f26367623ced;p=snaps.git

Check dev_os_env_file exists before loading it

The testcases should work even if no specific metadata are set.

Change-Id: I3fa6aea3588f37946a847042903f313e33a728f8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/snaps/openstack/tests/os_source_file_test.py b/snaps/openstack/tests/os_source_file_test.py
index bd98ad3..cddf395 100644
--- a/snaps/openstack/tests/os_source_file_test.py
+++ b/snaps/openstack/tests/os_source_file_test.py
@@ -63,13 +63,15 @@ 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 = {}
         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}
+            if file_utils.file_exists(dev_os_env_file):
+                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