X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;h=b98bc9e52f38732f52c6a42daaadd44017699e2f;hb=96cb4393f12a5116a4eb7bd2f5daad051ab75e9e;hp=c1a7f1889b1a3a31256a03d8069745832b0e9f92;hpb=017c4fb032ab1f63e1ce474e12787204f33fce96;p=osm%2Fosmclient.git

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index c1a7f18..b98bc9e 100755
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -35,10 +35,10 @@ def check_client_version(obj, what, version='sol005'):
     :return: -
     :raises ClientError: if the specified version does not match the client version
     '''
-    fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
-    message = 'the following commands or options are only supported with the option "--sol005": {}'.format(what)
+    fullclassname = obj.__module__ + "." + obj.__class__.__name__
+    message = 'The following commands or options are only supported with the option "--sol005": {}'.format(what)
     if version == 'v1':
-        message = 'the following commands or options are not supported when using option "--sol005": {}'.format(what)
+        message = 'The following commands or options are not supported when using option "--sol005": {}'.format(what)
     if fullclassname != 'osmclient.{}.client.Client'.format(version):
         raise ClientException(message)
     return
@@ -104,7 +104,7 @@ def cli(ctx, hostname, so_port, so_project, ro_hostname, ro_port, sol005):
 def ns_list(ctx, filter):
     '''list all NS instances'''
     if filter:
-        check_client_version(ctx.obj, '--filter option')
+        check_client_version(ctx.obj, '--filter')
         resp = ctx.obj.ns.list(filter)
     else:
         resp = ctx.obj.ns.list()
@@ -117,16 +117,20 @@ def ns_list(ctx, filter):
         fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
         if fullclassname == 'osmclient.sol005.client.Client':
             nsr = ns
+            nsr_name = nsr['name']
+            nsr_id = nsr['_id']
         else:
             nsopdata = ctx.obj.ns.get_opdata(ns['id'])
             nsr = nsopdata['nsr:nsr']
+            nsr_name = nsr['name-ref']
+            nsr_id = nsr['ns-instance-config-ref']
         opstatus = nsr['operational-status'] if 'operational-status' in nsr else 'Not found'
         configstatus = nsr['config-status'] if 'config-status' in nsr else 'Not found'
         if configstatus == "config_not_needed":
             configstatus = "configured (no charms)"
         table.add_row(
-            [nsr['name'],
-             nsr['_id'],
+            [nsr_name,
+             nsr_id,
              opstatus,
              configstatus])
     table.align = 'l'
@@ -213,7 +217,12 @@ def vnfd_list2(ctx, filter):
 @click.pass_context
 def vnf_list(ctx):
     ''' list all VNF instances'''
-    resp = ctx.obj.vnf.list()
+    try:
+        check_client_version(ctx.obj, ctx.command.name, 'v1')
+        resp = ctx.obj.vnf.list()
+    except ClientException as inst:
+        print(inst.message)
+        exit(1)
     table = PrettyTable(
         ['vnf name',
          'id',
@@ -529,7 +538,8 @@ def vnfd_create2(ctx, filename, overwrite):
               help='comma separated list of keys to inject to vnfs')
 @click.option('--config',
               default=None,
-              help='ns specific yaml configuration')
+              help='ns specific yaml configuration:\nvnf: [member-vnf-index: TEXT, vim_account: TEXT]\n'
+              'vld: [name: TEXT, vim-network-name: TEXT or DICT with vim_account, vim_net entries]')
 @click.pass_context
 def ns_create(ctx,
               nsd_name,
@@ -540,8 +550,8 @@ def ns_create(ctx,
               config):
     '''creates a new NS instance'''
     try:
-        if config:
-            check_client_version(ctx.obj, '--config', 'v1')
+        # if config:
+        #     check_client_version(ctx.obj, '--config', 'v1')
         ctx.obj.ns.create(
             nsd_name,
             ns_name,
@@ -856,6 +866,8 @@ def vim_show(ctx, name):
     '''
     try:
         resp = ctx.obj.vim.get(name)
+        if 'vim_password' in resp:
+            resp['vim_password']='********'
     except ClientException as inst:
         print(inst.message)
         exit(1)