X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osmclient%2Fscripts%2Fosm.py;h=670161fced5e11f4f7630c081211afa291a37b5d;hb=106db6b8711c842a3aa6930d2da0238ede31d949;hp=c500286821ff1531c33328759046f499cbb0be1d;hpb=a63fb3c6887ecf8221e868e0c8d39d51319ea085;p=osm%2Fosmclient.git

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index c500286..670161f 100755
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -95,9 +95,9 @@ def check_client_version(obj, what, version='sol005'):
 @click.pass_context
 def cli(ctx, hostname, sol005, user, password, project, so_port, so_project, ro_hostname, ro_port):
     if hostname is None:
-        print((
+        print(
             "either hostname option or OSM_HOSTNAME " +
-            "environment variable needs to be specified"))
+            "environment variable needs to be specified")
         exit(1)
     kwargs={}
     if so_port is not None:
@@ -316,7 +316,7 @@ def nfpkg_list(ctx, nf_type, filter):
         check_client_version(ctx.obj, ctx.command.name)
         vnfd_list(ctx, nf_type, filter)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -331,7 +331,7 @@ def vnf_list(ctx, ns, filter):
         else:
             resp = ctx.obj.vnf.list()
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
     fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
     if fullclassname == 'osmclient.sol005.client.Client':
@@ -450,7 +450,7 @@ def ns_op_list(ctx, name):
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.ns.list_op(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     table = PrettyTable(['id', 'operation', 'status'])
@@ -467,7 +467,7 @@ def nsi_list(ctx, filter):
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.nsi.list(filter)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
     table = PrettyTable(
         ['netslice instance name',
@@ -516,7 +516,7 @@ def nst_list(ctx, filter):
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.nst.list(filter)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
     # print yaml.safe_dump(resp)
     table = PrettyTable(['nst name', 'id'])
@@ -550,7 +550,7 @@ def nsi_op_list(ctx, name):
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.nsi.list_op(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
     table = PrettyTable(['id', 'operation', 'status'])
     for op in resp:
@@ -592,7 +592,7 @@ def pdu_list(ctx, filter):
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.pdu.list(filter)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
     table = PrettyTable(
         ['pdu name',
@@ -626,7 +626,7 @@ def nsd_show(ctx, name, literal):
         resp = ctx.obj.nsd.get(name)
         # resp = ctx.obj.nsd.get_individual(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     if literal:
@@ -671,7 +671,7 @@ def vnfd_show(ctx, name, literal):
         resp = ctx.obj.vnfd.get(name)
         # resp = ctx.obj.vnfd.get_individual(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     if literal:
@@ -738,7 +738,7 @@ def ns_show(ctx, name, literal, filter):
     try:
         ns = ctx.obj.ns.get(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     if literal:
@@ -777,7 +777,7 @@ def vnf_show(ctx, name, literal, filter):
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.vnf.get(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     if literal:
@@ -800,7 +800,7 @@ def vnf_monitoring_show(ctx, vnf_name):
         check_client_version(ctx.obj, ctx.command.name, 'v1')
         resp = ctx.obj.vnf.get_monitoring(vnf_name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
@@ -823,7 +823,7 @@ def ns_monitoring_show(ctx, ns_name):
         check_client_version(ctx.obj, ctx.command.name, 'v1')
         resp = ctx.obj.ns.get_monitoring(ns_name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
@@ -851,7 +851,7 @@ def ns_op_show(ctx, id, filter):
         check_client_version(ctx.obj, ctx.command.name)
         op_info = ctx.obj.ns.get_op(id)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     table = PrettyTable(['field', 'value'])
@@ -868,7 +868,7 @@ def nst_show(ctx, name, literal):
         resp = ctx.obj.nst.get(name)
         #resp = ctx.obj.nst.get_individual(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     if literal:
@@ -913,7 +913,7 @@ def nsi_show(ctx, name, literal, filter):
         check_client_version(ctx.obj, ctx.command.name)
         nsi = ctx.obj.nsi.get(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     if literal:
@@ -963,7 +963,7 @@ def nsi_op_show(ctx, id, filter):
         check_client_version(ctx.obj, ctx.command.name)
         op_info = ctx.obj.nsi.get_op(id)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     table = PrettyTable(['field', 'value'])
@@ -1013,7 +1013,7 @@ def pdu_show(ctx, name, literal, filter):
         check_client_version(ctx.obj, ctx.command.name)
         pdu = ctx.obj.pdu.get(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     if literal:
@@ -1039,7 +1039,7 @@ def nsd_create(ctx, filename, overwrite):
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nsd.create(filename, overwrite)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1074,7 +1074,7 @@ def vnfd_create(ctx, filename, overwrite):
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.vnfd.create(filename, overwrite)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1136,6 +1136,12 @@ def nfpkg_create(ctx, filename, overwrite):
 @click.option('--config_file',
               default=None,
               help='ns specific yaml configuration file')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
 def ns_create(ctx,
               nsd_name,
@@ -1144,7 +1150,8 @@ def ns_create(ctx,
               admin_status,
               ssh_keys,
               config,
-              config_file):
+              config_file,
+              wait):
     """creates a new NS instance"""
     try:
         if config_file:
@@ -1158,7 +1165,8 @@ def ns_create(ctx,
             ns_name,
             config=config,
             ssh_keys=ssh_keys,
-            account=vim_account)
+            account=vim_account,
+            wait=wait)
     except ClientException as inst:
         print(inst.message)
         exit(1)
@@ -1169,7 +1177,7 @@ def nst_create(ctx, filename, overwrite):
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nst.create(filename, overwrite)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1199,7 +1207,7 @@ def nst_create2(ctx, filename, overwrite):
     nst_create(ctx, filename, overwrite)
 
 
-def nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file):
+def nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait):
     """creates a new Network Slice Instance (NSI)"""
     try:
         check_client_version(ctx.obj, ctx.command.name)
@@ -1209,7 +1217,7 @@ def nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_fi
             with open(config_file, 'r') as cf:
                 config=cf.read()
         ctx.obj.nsi.create(nst_name, nsi_name, config=config, ssh_keys=ssh_keys,
-                           account=vim_account)
+                           account=vim_account, wait=wait)
     except ClientException as inst:
         print(inst.message)
         exit(1)
@@ -1235,10 +1243,16 @@ def nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_fi
 @click.option('--config_file',
               default=None,
               help='nsi specific yaml configuration file')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
-def nsi_create1(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file):
+def nsi_create1(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait):
     """creates a new Network Slice Instance (NSI)"""
-    nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file)
+    nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait=wait)
 
 
 @cli.command(name='netslice-instance-create', short_help='creates a new Network Slice Instance')
@@ -1259,10 +1273,16 @@ def nsi_create1(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_f
 @click.option('--config_file',
               default=None,
               help='nsi specific yaml configuration file')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
-def nsi_create2(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file):
+def nsi_create2(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait):
     """creates a new Network Slice Instance (NSI)"""
-    nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file)
+    nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait=wait)
 
 
 @cli.command(name='pdu-create', short_help='adds a new Physical Deployment Unit to the catalog')
@@ -1306,10 +1326,9 @@ def pdu_create(ctx, name, pdu_type, interface, description, vim_account, descrip
             pdu["interfaces"] = ifaces_list
         ctx.obj.pdu.create(pdu)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
-
 ####################
 # UPDATE operations
 ####################
@@ -1319,7 +1338,7 @@ def nsd_update(ctx, name, content):
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nsd.update(name, content)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1354,7 +1373,7 @@ def vnfd_update(ctx, name, content):
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.vnfd.update(name, content)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1402,7 +1421,7 @@ def nst_update(ctx, name, content):
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nst.update(name, content)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1444,7 +1463,7 @@ def nsd_delete(ctx, name, force):
             check_client_version(ctx.obj, '--force')
             ctx.obj.nsd.delete(name, force)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1480,7 +1499,7 @@ def vnfd_delete(ctx, name, force):
             check_client_version(ctx.obj, '--force')
             ctx.obj.vnfd.delete(name, force)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1523,20 +1542,26 @@ def nfpkg_delete(ctx, name, force):
 @cli.command(name='ns-delete', short_help='deletes a NS instance')
 @click.argument('name')
 @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
-def ns_delete(ctx, name, force):
+def ns_delete(ctx, name, force, wait):
     """deletes a NS instance
 
     NAME: name or ID of the NS instance to be deleted
     """
     try:
         if not force:
-            ctx.obj.ns.delete(name)
+            ctx.obj.ns.delete(name, wait=wait)
         else:
             check_client_version(ctx.obj, '--force')
-            ctx.obj.ns.delete(name, force)
+            ctx.obj.ns.delete(name, force, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1545,7 +1570,7 @@ def nst_delete(ctx, name, force):
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nst.delete(name, force)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1573,37 +1598,43 @@ def nst_delete2(ctx, name, force):
     nst_delete(ctx, name, force)
 
 
-def nsi_delete(ctx, name, force):
+def nsi_delete(ctx, name, force, wait):
     try:
         check_client_version(ctx.obj, ctx.command.name)
-        ctx.obj.nsi.delete(name, force)
+        ctx.obj.nsi.delete(name, force, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
 @cli.command(name='nsi-delete', short_help='deletes a Network Slice Instance (NSI)')
 @click.argument('name')
 @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
-def nsi_delete1(ctx, name, force):
+def nsi_delete1(ctx, name, force, wait):
     """deletes a Network Slice Instance (NSI)
 
     NAME: name or ID of the Network Slice instance to be deleted
     """
-    nsi_delete(ctx, name, force)
+    nsi_delete(ctx, name, force, wait=wait)
 
 
 @cli.command(name='netslice-instance-delete', short_help='deletes a Network Slice Instance (NSI)')
 @click.argument('name')
 @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
 @click.pass_context
-def nsi_delete2(ctx, name, force):
+def nsi_delete2(ctx, name, force, wait):
     """deletes a Network Slice Instance (NSI)
 
     NAME: name or ID of the Network Slice instance to be deleted
     """
-    nsi_delete(ctx, name, force)
+    nsi_delete(ctx, name, force, wait=wait)
 
 
 @cli.command(name='pdu-delete', short_help='deletes a Physical Deployment Unit (PDU)')
@@ -1619,13 +1650,13 @@ def pdu_delete(ctx, name, force):
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.pdu.delete(name, force)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
-####################
+#################
 # VIM operations
-####################
+#################
 
 @cli.command(name='vim-create')
 @click.option('--name',
@@ -1656,6 +1687,12 @@ def pdu_delete(ctx, name, force):
               help='human readable description')
 @click.option('--sdn_controller', default=None, help='Name or id of the SDN controller associated to this VIM account')
 @click.option('--sdn_port_mapping', default=None, help="File describing the port mapping between compute nodes' ports and switch ports")
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
 def vim_create(ctx,
                name,
@@ -1667,7 +1704,8 @@ def vim_create(ctx,
                account_type,
                description,
                sdn_controller,
-               sdn_port_mapping):
+               sdn_port_mapping,
+               wait):
     """creates a new VIM account"""
     try:
         if sdn_controller:
@@ -1683,11 +1721,11 @@ def vim_create(ctx,
         vim['description'] = description
         vim['config'] = config
         if sdn_controller or sdn_port_mapping:
-            ctx.obj.vim.create(name, vim, sdn_controller, sdn_port_mapping)
+            ctx.obj.vim.create(name, vim, sdn_controller, sdn_port_mapping, wait=wait)
         else:
-            ctx.obj.vim.create(name, vim)
+            ctx.obj.vim.create(name, vim, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1703,6 +1741,12 @@ def vim_create(ctx,
 @click.option('--description', help='human readable description')
 @click.option('--sdn_controller', default=None, help='Name or id of the SDN controller associated to this VIM account')
 @click.option('--sdn_port_mapping', default=None, help="File describing the port mapping between compute nodes' ports and switch ports")
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
 def vim_update(ctx,
                name,
@@ -1715,7 +1759,8 @@ def vim_update(ctx,
                account_type,
                description,
                sdn_controller,
-               sdn_port_mapping):
+               sdn_port_mapping,
+               wait):
     """updates a VIM account
 
     NAME: name or ID of the VIM account
@@ -1731,29 +1776,35 @@ def vim_update(ctx,
         if account_type: vim['vim_type'] = account_type
         if description: vim['description'] = description
         if config: vim['config'] = config
-        ctx.obj.vim.update(name, vim, sdn_controller, sdn_port_mapping)
+        ctx.obj.vim.update(name, vim, sdn_controller, sdn_port_mapping, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
 @cli.command(name='vim-delete')
 @click.argument('name')
 @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
-def vim_delete(ctx, name, force):
+def vim_delete(ctx, name, force, wait):
     """deletes a VIM account
 
     NAME: name or ID of the VIM account to be deleted
     """
     try:
         if not force:
-            ctx.obj.vim.delete(name)
+            ctx.obj.vim.delete(name, wait=wait)
         else:
             check_client_version(ctx.obj, '--force')
-            ctx.obj.vim.delete(name, force)
+            ctx.obj.vim.delete(name, force, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1795,7 +1846,7 @@ def vim_show(ctx, name):
         if 'vim_password' in resp:
             resp['vim_password']='********'
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     table = PrettyTable(['key', 'attribute'])
@@ -1831,6 +1882,12 @@ def vim_show(ctx, name):
               default='no description',
               help='human readable description')
 @click.option('--wim_port_mapping', default=None, help="File describing the port mapping between DC edge (datacenters, switches, ports) and WAN edge (WAN service endpoint id and info)")
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
 def wim_create(ctx,
                name,
@@ -1841,7 +1898,8 @@ def wim_create(ctx,
                config,
                wim_type,
                description,
-               wim_port_mapping):
+               wim_port_mapping,
+               wait):
     """creates a new WIM account"""
     try:
         check_client_version(ctx.obj, ctx.command.name)
@@ -1857,9 +1915,9 @@ def wim_create(ctx,
         wim['wim_type'] = wim_type
         if description: wim['description'] = description
         if config: wim['config'] = config
-        ctx.obj.wim.create(name, wim, wim_port_mapping)
+        ctx.obj.wim.create(name, wim, wim_port_mapping, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1873,6 +1931,12 @@ def wim_create(ctx,
 @click.option('--wim_type', help='WIM type')
 @click.option('--description', help='human readable description')
 @click.option('--wim_port_mapping', default=None, help="File describing the port mapping between DC edge (datacenters, switches, ports) and WAN edge (WAN service endpoint id and info)")
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
 def wim_update(ctx,
                name,
@@ -1883,7 +1947,8 @@ def wim_update(ctx,
                config,
                wim_type,
                description,
-               wim_port_mapping):
+               wim_port_mapping,
+               wait):
     """updates a WIM account
 
     NAME: name or ID of the WIM account
@@ -1899,26 +1964,32 @@ def wim_update(ctx,
         if wim_type: wim['wim_type'] = wim_type
         if description: wim['description'] = description
         if config: wim['config'] = config
-        ctx.obj.wim.update(name, wim, wim_port_mapping)
+        ctx.obj.wim.update(name, wim, wim_port_mapping, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
 @cli.command(name='wim-delete')
 @click.argument('name')
 @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
-def wim_delete(ctx, name, force):
+def wim_delete(ctx, name, force, wait):
     """deletes a WIM account
 
     NAME: name or ID of the WIM account to be deleted
     """
     try:
         check_client_version(ctx.obj, ctx.command.name)
-        ctx.obj.wim.delete(name, force)
+        ctx.obj.wim.delete(name, force, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1937,7 +2008,7 @@ def wim_list(ctx, filter):
         table.align = 'l'
         print(table)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -1955,7 +2026,7 @@ def wim_show(ctx, name):
         if 'password' in resp:
             resp['wim_password']='********'
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     table = PrettyTable(['key', 'attribute'])
@@ -1977,7 +2048,7 @@ def wim_show(ctx, name):
               prompt=True,
               help='SDN controller type')
 @click.option('--sdn_controller_version',
-              help='SDN controller username')
+              help='SDN controller version')
 @click.option('--ip_address',
               prompt=True,
               help='SDN controller IP address')
@@ -1996,16 +2067,23 @@ def wim_show(ctx, name):
 #@click.option('--description',
 #              default='no description',
 #              help='human readable description')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
 def sdnc_create(ctx,
-               name,
-               type,
-               sdn_controller_version,
-               ip_address,
-               port,
-               switch_dpid,
-               user,
-               password):
+                name,
+                type,
+                sdn_controller_version,
+                ip_address,
+                port,
+                switch_dpid,
+                user,
+                password,
+                wait):
     """creates a new SDN controller"""
     sdncontroller = {}
     sdncontroller['name'] = name
@@ -2022,10 +2100,10 @@ def sdnc_create(ctx,
 #    sdncontroller['description'] = description
     try:
         check_client_version(ctx.obj, ctx.command.name)
-        ctx.obj.sdnc.create(name, sdncontroller)
+        ctx.obj.sdnc.create(name, sdncontroller, wait=wait)
     except ClientException as inst:
-        print((inst.message))
-
+        print(inst.message)
+        exit(1)
 
 @cli.command(name='sdnc-update', short_help='updates an SDN controller')
 @click.argument('name')
@@ -2038,17 +2116,24 @@ def sdnc_create(ctx,
 @click.option('--user', help='SDN controller username')
 @click.option('--password', help='SDN controller password')
 #@click.option('--description',  default=None, help='human readable description')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
 def sdnc_update(ctx,
-               name,
-               newname,
-               type,
-               sdn_controller_version,
-               ip_address,
-               port,
-               switch_dpid,
-               user,
-               password):
+                name,
+                newname,
+                type,
+                sdn_controller_version,
+                ip_address,
+                port,
+                switch_dpid,
+                user,
+                password,
+                wait):
     """updates an SDN controller
 
     NAME: name or ID of the SDN controller
@@ -2077,26 +2162,32 @@ def sdnc_update(ctx,
             sdncontroller['password'] = user
     try:
         check_client_version(ctx.obj, ctx.command.name)
-        ctx.obj.sdnc.update(name, sdncontroller)
+        ctx.obj.sdnc.update(name, sdncontroller, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
 @cli.command(name='sdnc-delete')
 @click.argument('name')
 @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
-def sdnc_delete(ctx, name, force):
+def sdnc_delete(ctx, name, force, wait):
     """deletes an SDN controller
 
     NAME: name or ID of the SDN controller to be deleted
     """
     try:
         check_client_version(ctx.obj, ctx.command.name)
-        ctx.obj.sdnc.delete(name, force)
+        ctx.obj.sdnc.delete(name, force, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -2110,9 +2201,9 @@ def sdnc_list(ctx, filter):
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.sdnc.list(filter)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
-    table = PrettyTable(['name', 'id'])
+    table = PrettyTable(['sdnc name', 'id'])
     for sdnc in resp:
         table.add_row([sdnc['name'], sdnc['_id']])
     table.align = 'l'
@@ -2131,7 +2222,7 @@ def sdnc_show(ctx, name):
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.sdnc.get(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     table = PrettyTable(['key', 'attribute'])
@@ -2163,6 +2254,7 @@ def project_create(ctx, name):
         ctx.obj.project.create(name, project)
     except ClientException as inst:
         print(inst.message)
+        exit(1)
 
 
 @cli.command(name='project-delete')
@@ -2223,6 +2315,33 @@ def project_show(ctx, name):
     print(table)
 
 
+@cli.command(name='project-update')
+@click.argument('project')
+@click.option('--name',
+              prompt=True,
+              help='new name for the project')
+
+@click.pass_context
+def project_update(ctx, project, name):
+    """
+    Update a project name
+
+    :param ctx:
+    :param project: id or name of the project to modify
+    :param name:  new name for the project
+    :return:
+    """
+
+    project_changes = {}
+    project_changes['name'] = name
+
+    try:
+        check_client_version(ctx.obj, ctx.command.name)
+        ctx.obj.project.update(project, project_changes)
+    except ClientException as inst:
+        print(inst.message)
+
+
 ####################
 # User mgmt operations
 ####################
@@ -2235,11 +2354,11 @@ def project_show(ctx, name):
               confirmation_prompt=True,
               help='user password')
 @click.option('--projects',
-              prompt="Comma separate list of projects",
+              # prompt="Comma separate list of projects",
               multiple=True,
               callback=lambda ctx, param, value: ''.join(value).split(',') if all(len(x)==1 for x in value) else value,
               help='list of project ids that the user belongs to')
-@click.option('--project-role-mapping', 'project_role_mappings',
+@click.option('--project-role-mappings', 'project_role_mappings',
               default=None, multiple=True,
               help='creating user project/role(s) mapping')
 @click.pass_context
@@ -2256,22 +2375,26 @@ def user_create(ctx, username, password, projects, project_role_mappings):
     user['username'] = username
     user['password'] = password
     user['projects'] = projects
-    user['project-role-mappings'] = project_role_mappings
+    user['project_role_mappings'] = project_role_mappings
     
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.user.create(username, user)
     except ClientException as inst:
         print(inst.message)
+        exit(1)
 
 
 @cli.command(name='user-update')
 @click.argument('username')
 @click.option('--password',
-              prompt=True,
-              hide_input=True,
-              confirmation_prompt=True,
+              # prompt=True,
+              # hide_input=True,
+              # confirmation_prompt=True,
               help='user password')
+@click.option('--set-username', 'set_username',
+              default=None,
+              help='change username')
 @click.option('--set-project', 'set_project',
               default=None, multiple=True,
               help='create/replace the project,role(s) mapping for this project: \'project,role1,role2,...\'')
@@ -2285,21 +2408,22 @@ def user_create(ctx, username, password, projects, project_role_mappings):
               default=None, multiple=True,
               help='removes project,role(s) mapping: \'project,role1,role2,...\'')
 @click.pass_context
-def user_update(ctx, username, password, set_project, remove_project,
+def user_update(ctx, username, password, set_username, set_project, remove_project,
                 add_project_role, remove_project_role):
     """Update a user information
 
     \b
     USERNAME: name of the user
     PASSWORD: new password
+    SET_USERNAME: new username
     SET_PROJECT: creating mappings for project/role(s)
     REMOVE_PROJECT: deleting mappings for project/role(s)
     ADD_PROJECT_ROLE: adding mappings for project/role(s)
     REMOVE_PROJECT_ROLE: removing mappings for project/role(s)
     """
     user = {}
-    user['username'] = username
     user['password'] = password
+    user['username'] = set_username
     user['set-project'] = set_project
     user['remove-project'] = remove_project
     user['add-project-role'] = add_project_role
@@ -2310,6 +2434,7 @@ def user_update(ctx, username, password, set_project, remove_project,
         ctx.obj.user.update(username, user)
     except ClientException as inst:
         print(inst.message)
+        exit(1)
 
 
 @cli.command(name='user-delete')
@@ -2398,23 +2523,25 @@ def user_show(ctx, name):
 def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity,
                     threshold_value, threshold_operator, statistic):
     """creates a new alarm for a NS instance"""
-    ns_instance = ctx.obj.ns.get(ns)
-    alarm = {}
-    alarm['alarm_name'] = name
-    alarm['ns_id'] = ns_instance['_id']
-    alarm['correlation_id'] = ns_instance['_id']
-    alarm['vnf_member_index'] = vnf
-    alarm['vdu_name'] = vdu
-    alarm['metric_name'] = metric
-    alarm['severity'] = severity
-    alarm['threshold_value'] = int(threshold_value)
-    alarm['operation'] = threshold_operator
-    alarm['statistic'] = statistic
-    try:
+    # TODO: Check how to validate threshold_value.
+    # Should it be an integer (1-100), percentage, or decimal (0.01-1.00)?
+    try:
+        ns_instance = ctx.obj.ns.get(ns)
+        alarm = {}
+        alarm['alarm_name'] = name
+        alarm['ns_id'] = ns_instance['_id']
+        alarm['correlation_id'] = ns_instance['_id']
+        alarm['vnf_member_index'] = vnf
+        alarm['vdu_name'] = vdu
+        alarm['metric_name'] = metric
+        alarm['severity'] = severity
+        alarm['threshold_value'] = int(threshold_value)
+        alarm['operation'] = threshold_operator
+        alarm['statistic'] = statistic
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.ns.create_alarm(alarm)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -2422,10 +2549,10 @@ def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity,
 #@click.argument('name')
 #@click.pass_context
 #def ns_alarm_delete(ctx, name):
-#    '''deletes an alarm
+#    """deletes an alarm
 #
 #    NAME: name of the alarm to be deleted
-#    '''
+#    """
 #    try:
 #        check_client_version(ctx.obj, ctx.command.name)
 #        ctx.obj.ns.delete_alarm(name)
@@ -2452,16 +2579,18 @@ def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity,
 @click.pass_context
 def ns_metric_export(ctx, ns, vnf, vdu, metric, interval):
     """exports a metric to the internal OSM bus, which can be read by other apps"""
-    ns_instance = ctx.obj.ns.get(ns)
-    metric_data = {}
-    metric_data['ns_id'] = ns_instance['_id']
-    metric_data['correlation_id'] = ns_instance['_id']
-    metric_data['vnf_member_index'] = vnf
-    metric_data['vdu_name'] = vdu
-    metric_data['metric_name'] = metric
-    metric_data['collection_unit'] = 'WEEK'
-    metric_data['collection_period'] = 1
-    try:
+    # TODO: Check how to validate interval.
+    # Should it be an integer (seconds), or should a suffix (s,m,h,d,w) also be permitted?
+    try:
+        ns_instance = ctx.obj.ns.get(ns)
+        metric_data = {}
+        metric_data['ns_id'] = ns_instance['_id']
+        metric_data['correlation_id'] = ns_instance['_id']
+        metric_data['vnf_member_index'] = vnf
+        metric_data['vdu_name'] = vdu
+        metric_data['metric_name'] = metric
+        metric_data['collection_unit'] = 'WEEK'
+        metric_data['collection_period'] = 1
         check_client_version(ctx.obj, ctx.command.name)
         if not interval:
             print('{}'.format(ctx.obj.ns.export_metric(metric_data)))
@@ -2472,7 +2601,7 @@ def ns_metric_export(ctx, ns, vnf, vdu, metric, interval):
                 time.sleep(int(interval))
                 i+=1
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -2494,7 +2623,7 @@ def upload_package(ctx, filename):
         if fullclassname != 'osmclient.sol005.client.Client':
             ctx.obj.package.wait_for_upload(filename)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -2510,7 +2639,7 @@ def show_ns_scaling(ctx, ns_name):
         check_client_version(ctx.obj, ctx.command.name, 'v1')
         resp = ctx.obj.ns.list()
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
     table = PrettyTable(
@@ -2544,17 +2673,23 @@ def show_ns_scaling(ctx, ns_name):
 @click.argument('ns_name')
 @click.option('--ns_scale_group', prompt=True)
 @click.option('--index', prompt=True)
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
-def ns_scale(ctx, ns_name, ns_scale_group, index):
+def ns_scale(ctx, ns_name, ns_scale_group, index, wait):
     """scales NS
 
     NS_NAME: name of the NS instance to be scaled
     """
     try:
         check_client_version(ctx.obj, ctx.command.name, 'v1')
-        ctx.obj.ns.scale(ns_name, ns_scale_group, index)
+        ctx.obj.ns.scale(ns_name, ns_scale_group, index, wait=wait)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -2565,7 +2700,7 @@ def config_agent_list(ctx):
     try:
         check_client_version(ctx.obj, ctx.command.name, 'v1')
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
     table = PrettyTable(['name', 'account-type', 'details'])
     for account in ctx.obj.vca.list():
@@ -2589,7 +2724,7 @@ def config_agent_delete(ctx, name):
         check_client_version(ctx.obj, ctx.command.name, 'v1')
         ctx.obj.vca.delete(name)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -2613,7 +2748,7 @@ def config_agent_add(ctx, name, account_type, server, user, secret):
         check_client_version(ctx.obj, ctx.command.name, 'v1')
         ctx.obj.vca.create(name, account_type, server, user, secret)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -2644,30 +2779,48 @@ def vcs_list(ctx):
 
 @cli.command(name='ns-action')
 @click.argument('ns_name')
-@click.option('--vnf_name', default=None)
+@click.option('--vnf_name', default=None, help='member-vnf-index if the target is a vnf instead of a ns)')
+@click.option('--vdu_id', default=None, help='vdu-id if the target is a vdu o a vnf')
+@click.option('--vdu_count', default=None, help='number of vdu instance of this vdu_id')
 @click.option('--action_name', prompt=True)
-@click.option('--params', prompt=True)
+@click.option('--params', default=None)
+@click.option('--wait',
+              required=False,
+              default=False,
+              is_flag=True,
+              help='do not return the control immediately, but keep it \
+              until the operation is completed, or timeout')
 @click.pass_context
 def ns_action(ctx,
               ns_name,
               vnf_name,
+              vdu_id,
+              vdu_count,
               action_name,
-              params):
+              params,
+              wait):
     """executes an action/primitive over a NS instance
 
     NS_NAME: name or ID of the NS instance
     """
     try:
         check_client_version(ctx.obj, ctx.command.name)
-        op_data={}
+        op_data = {}
         if vnf_name:
-            op_data['vnf_member_index'] = vnf_name
+            op_data['member_vnf_index'] = vnf_name
+        if vdu_id:
+            op_data['vdu_id'] = vdu_id
+        if vdu_count:
+            op_data['vdu_count_index'] = vdu_count
         op_data['primitive'] = action_name
-        op_data['primitive_params'] = yaml.load(params)
-        ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data)
+        if params:
+            op_data['primitive_params'] = yaml.load(params)
+        else:
+            op_data['primitive_params'] = {}
+        ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data, wait=wait)
 
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -2697,7 +2850,7 @@ def vnf_scale(ctx,
             scale_out = True
         ctx.obj.ns.scale_vnf(ns_name, vnf_name, scaling_group, scale_in, scale_out)
     except ClientException as inst:
-        print((inst.message))
+        print(inst.message)
         exit(1)
 
 
@@ -2707,11 +2860,11 @@ def vnf_scale(ctx,
 
 @cli.command(name='role-create', short_help='creates a role')
 @click.argument('name')
-@click.option('--definition',
+@click.option('--permissions',
               default=None,
-              help='role definition using a dictionary')
+              help='role permissions using a dictionary')
 @click.pass_context
-def role_create(ctx, name, definition):
+def role_create(ctx, name, permissions):
     """
     Creates a new role.
 
@@ -2721,24 +2874,28 @@ def role_create(ctx, name, definition):
     """
     try:
         check_client_version(ctx.obj, ctx.command.name)
-        ctx.obj.role.create(name, definition)
+        ctx.obj.role.create(name, permissions)
     except ClientException as inst:
         print(inst.message)
+        exit(1)
 
 
 @cli.command(name='role-update', short_help='updates a role')
 @click.argument('name')
-@click.option('--definition',
+@click.option('--set-name',
               default=None,
-              help='add a new definition to the role')
+              help='change name of rle')
+# @click.option('--permissions',
+#               default=None,
+#               help='provide a yaml format dictionary with incremental changes. Values can be bool or None to delete')
 @click.option('--add',
               default=None,
-              help='add a resource access grant/denial')
+              help='yaml format dictionary with permission: True/False to access grant/denial')
 @click.option('--remove',
               default=None,
-              help='remove a resource access grant/denial')
+              help='yaml format list to remove a permission')
 @click.pass_context
-def role_update(ctx, name, definition, add, remove):
+def role_update(ctx, name, set_name, add, remove):
     """
     Updates a role.
 
@@ -2750,7 +2907,7 @@ def role_update(ctx, name, definition, add, remove):
     """
     try:
         check_client_version(ctx.obj, ctx.command.name)
-        ctx.obj.role.update(name, definition, add, remove)
+        ctx.obj.role.update(name, set_name, None, add, remove)
     except ClientException as inst:
         print(inst.message)
         exit(1)