From: garciaale <agarcia@whitestack.com>
Date: Wed, 4 Nov 2020 18:46:38 +0000 (-0300)
Subject: Changes method for detecting package type, as the catalog option does not exist on... 
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=00ff330b5a14ce04573b7d0945588ba11c613024;p=osm%2Fosmclient.git

Changes method for detecting package type, as the catalog option does not exist on SOL006 and the root is simply called nsd or vnfd

Change-Id: I249ef23e7d569c159cdd6d6361020b7558ffd2e2
Signed-off-by: garciaale <agarcia@whitestack.com>
---

diff --git a/osmclient/common/utils.py b/osmclient/common/utils.py
index ec0e0b0..6d5ebd8 100644
--- a/osmclient/common/utils.py
+++ b/osmclient/common/utils.py
@@ -68,23 +68,11 @@ def get_key_val_from_pkg(descriptor_file):
 
     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 v1.items():
-            if not k2.endswith('nsd') and not k2.endswith('vnfd'):
-                continue
+    for k in dict:
+        if 'nsd' in k:
+            result['type'] = 'nsd'
+        else:
+            result['type'] = 'vnfd'
 
-            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