Fix 1219. Adding juju-bundles parsing

[osm/osmclient.git] / osmclient / common / utils.py

diff --git a/osmclient/common/utils.py b/osmclient/common/utils.py
index 6b6c6f9..ec0e0b0 100644 (file)
--- a/osmclient/common/utils.py
+++ b/osmclient/common/utils.py
@@ -30,7 +30,7 @@ def wait_for_value(func, result=True, wait_time=10, catch_exception=None):
                 return True
         except catch_exception:
             pass
-        time.sleep(1)
+        time.sleep(5)
     try:
         return func() == result
     except catch_exception:
@@ -66,12 +66,12 @@ def get_key_val_from_pkg(descriptor_file):
     if yamlfile is None:
         return None
 
-    dict = yaml.load(tar.extractfile(yamlfile))
+    dict = yaml.safe_load(tar.extractfile(yamlfile))
     result = {}
     for k1, v1 in list(dict.items()):
         if not k1.endswith('-catalog'):
             continue
-        for k2, v2 in list(v1.items()):
+        for k2, v2 in v1.items():
             if not k2.endswith('nsd') and not k2.endswith('vnfd'):
                 continue