X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fcli_commands%2Fnspkg.py;h=be0304d30744a19731d6bfcb41d94098266164e6;hb=refs%2Fheads%2Fv14.0;hp=44f0a4f7ed066d8584bea147028752a03951a855;hpb=00bc0353583beab960fb853375dc1e8f4a77840d;p=osm%2Fosmclient.git

diff --git a/osmclient/cli_commands/nspkg.py b/osmclient/cli_commands/nspkg.py
index 44f0a4f..be0304d 100755
--- a/osmclient/cli_commands/nspkg.py
+++ b/osmclient/cli_commands/nspkg.py
@@ -33,51 +33,45 @@ def nsd_list(ctx, filter, long):
     else:
         resp = ctx.obj.nsd.list()
     # print(yaml.safe_dump(resp))
-    fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
-    if fullclassname == "osmclient.sol005.client.Client":
+    if long:
+        table = PrettyTable(
+            [
+                "nsd name",
+                "id",
+                "onboarding state",
+                "operational state",
+                "usage state",
+                "date",
+                "last update",
+            ]
+        )
+    else:
+        table = PrettyTable(["nsd name", "id"])
+    for nsd in resp:
+        name = nsd.get("id", "-")
         if long:
-            table = PrettyTable(
+            onb_state = nsd["_admin"].get("onboardingState", "-")
+            op_state = nsd["_admin"].get("operationalState", "-")
+            usage_state = nsd["_admin"].get("usageState", "-")
+            date = datetime.fromtimestamp(nsd["_admin"]["created"]).strftime(
+                "%Y-%m-%dT%H:%M:%S"
+            )
+            last_update = datetime.fromtimestamp(nsd["_admin"]["modified"]).strftime(
+                "%Y-%m-%dT%H:%M:%S"
+            )
+            table.add_row(
                 [
-                    "nsd name",
-                    "id",
-                    "onboarding state",
-                    "operational state",
-                    "usage state",
-                    "date",
-                    "last update",
+                    name,
+                    nsd["_id"],
+                    onb_state,
+                    op_state,
+                    usage_state,
+                    date,
+                    last_update,
                 ]
             )
         else:
-            table = PrettyTable(["nsd name", "id"])
-        for nsd in resp:
-            name = nsd.get("id", "-")
-            if long:
-                onb_state = nsd["_admin"].get("onboardingState", "-")
-                op_state = nsd["_admin"].get("operationalState", "-")
-                usage_state = nsd["_admin"].get("usageState", "-")
-                date = datetime.fromtimestamp(nsd["_admin"]["created"]).strftime(
-                    "%Y-%m-%dT%H:%M:%S"
-                )
-                last_update = datetime.fromtimestamp(
-                    nsd["_admin"]["modified"]
-                ).strftime("%Y-%m-%dT%H:%M:%S")
-                table.add_row(
-                    [
-                        name,
-                        nsd["_id"],
-                        onb_state,
-                        op_state,
-                        usage_state,
-                        date,
-                        last_update,
-                    ]
-                )
-            else:
-                table.add_row([name, nsd["_id"]])
-    else:
-        table = PrettyTable(["nsd name", "id"])
-        for nsd in resp:
-            table.add_row([nsd["name"], nsd["id"]])
+            table.add_row([name, nsd["_id"]])
     table.align = "l"
     print(table)