X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fcommon%2Futils.py;h=94bd72f9c762c84cca5de6d24cb404301a715b66;hb=020a95d1f1e290d57241737927b6691e9b69fa7b;hp=6b6c6f9717fe0d6d146acfad8ac4a03b20da2db6;hpb=a63fb3c6887ecf8221e868e0c8d39d51319ea085;p=osm%2Fosmclient.git

diff --git a/osmclient/common/utils.py b/osmclient/common/utils.py
index 6b6c6f9..94bd72f 100644
--- 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,25 +66,29 @@ 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()):
-            if not k2.endswith('nsd') and not k2.endswith('vnfd'):
+    for k in dict:
+        if 'nsd' in k:
+            result['type'] = 'nsd'
+        else:
+            result['type'] = 'vnfd'
+    if 'type' not in result:
+        for k1, v1 in list(dict.items()):
+            if not k1.endswith('-catalog'):
                 continue
+            for k2, v2 in v1.items():
+                if not k2.endswith('nsd') and not k2.endswith('vnfd'):
+                    continue
+                if 'nsd' in k2:
+                    result['type'] = 'nsd'
+                else:
+                    result['type'] = 'vnfd'
+                for entry in v2:
+                    for k3, v3 in list(entry.items()):
+                        # strip off preceeding chars before :
+                        key_name = k3.split(':').pop()
+                        result[key_name] = v3
 
-            if 'nsd' in k2:
-                result['type'] = 'nsd'
-            else:
-                result['type'] = 'vnfd'
-
-            for entry in v2:
-                for k3, v3 in list(entry.items()):
-                    # strip off preceeding chars before :
-                    key_name = k3.split(':').pop()
-
-                    result[key_name] = v3
     tar.close()
     return result