X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fcli_commands%2Fnfpkg.py;h=8d3f01b1b1e651a7d325814d4b4170d9cd466ce3;hb=c0420cf86aaed737f59666516dd9e4de5c5db16c;hp=c69be62ad964442c102349e190dd959e0d3a6870;hpb=00bc0353583beab960fb853375dc1e8f4a77840d;p=osm%2Fosmclient.git

diff --git a/osmclient/cli_commands/nfpkg.py b/osmclient/cli_commands/nfpkg.py
index c69be62..8d3f01b 100755
--- a/osmclient/cli_commands/nfpkg.py
+++ b/osmclient/cli_commands/nfpkg.py
@@ -53,60 +53,54 @@ def vnfd_list(ctx, nf_type, filter, long):
     else:
         resp = ctx.obj.vnfd.list()
     # print(yaml.safe_dump(resp))
-    fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
-    if fullclassname == "osmclient.sol005.client.Client":
+    if long:
+        table = PrettyTable(
+            [
+                "nfpkg name",
+                "id",
+                "desc type",
+                "vendor",
+                "version",
+                "onboarding state",
+                "operational state",
+                "usage state",
+                "date",
+                "last update",
+            ]
+        )
+    else:
+        table = PrettyTable(["nfpkg name", "id", "desc type"])
+    for vnfd in resp:
+        name = vnfd.get("id", vnfd.get("product-name", "-"))
+        descriptor_type = "sol006" if "product-name" in vnfd else "rel8"
         if long:
-            table = PrettyTable(
+            onb_state = vnfd["_admin"].get("onboardingState", "-")
+            op_state = vnfd["_admin"].get("operationalState", "-")
+            vendor = vnfd.get("provider", vnfd.get("vendor"))
+            version = vnfd.get("version")
+            usage_state = vnfd["_admin"].get("usageState", "-")
+            date = datetime.fromtimestamp(vnfd["_admin"]["created"]).strftime(
+                "%Y-%m-%dT%H:%M:%S"
+            )
+            last_update = datetime.fromtimestamp(vnfd["_admin"]["modified"]).strftime(
+                "%Y-%m-%dT%H:%M:%S"
+            )
+            table.add_row(
                 [
-                    "nfpkg name",
-                    "id",
-                    "desc type",
-                    "vendor",
-                    "version",
-                    "onboarding state",
-                    "operational state",
-                    "usage state",
-                    "date",
-                    "last update",
+                    name,
+                    vnfd["_id"],
+                    descriptor_type,
+                    vendor,
+                    version,
+                    onb_state,
+                    op_state,
+                    usage_state,
+                    date,
+                    last_update,
                 ]
             )
         else:
-            table = PrettyTable(["nfpkg name", "id", "desc type"])
-        for vnfd in resp:
-            name = vnfd.get("id", vnfd.get("name", "-"))
-            descriptor_type = "sol006" if "product-name" in vnfd else "rel8"
-            if long:
-                onb_state = vnfd["_admin"].get("onboardingState", "-")
-                op_state = vnfd["_admin"].get("operationalState", "-")
-                vendor = vnfd.get("provider", vnfd.get("vendor"))
-                version = vnfd.get("version")
-                usage_state = vnfd["_admin"].get("usageState", "-")
-                date = datetime.fromtimestamp(vnfd["_admin"]["created"]).strftime(
-                    "%Y-%m-%dT%H:%M:%S"
-                )
-                last_update = datetime.fromtimestamp(
-                    vnfd["_admin"]["modified"]
-                ).strftime("%Y-%m-%dT%H:%M:%S")
-                table.add_row(
-                    [
-                        name,
-                        vnfd["_id"],
-                        descriptor_type,
-                        vendor,
-                        version,
-                        onb_state,
-                        op_state,
-                        usage_state,
-                        date,
-                        last_update,
-                    ]
-                )
-            else:
-                table.add_row([name, vnfd["_id"], descriptor_type])
-    else:
-        table = PrettyTable(["nfpkg name", "id"])
-        for vnfd in resp:
-            table.add_row([vnfd["name"], vnfd["id"]])
+            table.add_row([name, vnfd["_id"], descriptor_type])
     table.align = "l"
     print(table)