From c077d238ed02fabea9e57cd3a8025cc86b146e44 Mon Sep 17 00:00:00 2001 From: tierno Date: Thu, 19 Dec 2019 10:44:16 +0000 Subject: [PATCH] prompt a proper message when OSM server is not running capture ClientException and others in a unique point to avoid code duplication Change-Id: I83e8ae4414b7eeebd91b49153ab3630c6c3515d5 Signed-off-by: tierno --- osmclient/scripts/osm.py | 1799 +++++++++++++++++++------------------- 1 file changed, 903 insertions(+), 896 deletions(-) diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py index 664ac62..4cc451b 100755 --- a/osmclient/scripts/osm.py +++ b/osmclient/scripts/osm.py @@ -111,7 +111,7 @@ CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'], max_content_width=16 # help='hostname of RO server. ' + # 'Also can set OSM_RO_PORT in environment') @click.pass_context -def cli(ctx, hostname, user, password, project): +def cli_osm(ctx, hostname, user, password, project): if hostname is None: print(( "either hostname option or OSM_HOSTNAME " + @@ -133,7 +133,6 @@ def cli(ctx, hostname, user, password, project): kwargs['password']=password if project is not None: kwargs['project']=project - ctx.obj = client.Client(host=hostname, sol005=sol005, **kwargs) @@ -141,7 +140,7 @@ def cli(ctx, hostname, user, password, project): # LIST operations #################### -@cli.command(name='ns-list', short_help='list all NS instances') +@cli_osm.command(name='ns-list', short_help='list all NS instances') @click.option('--filter', default=None, help='restricts the list to the NS instances matching the filter.') @click.pass_context @@ -252,7 +251,7 @@ def nsd_list(ctx, filter): print(table) -@cli.command(name='nsd-list', short_help='list all NS packages') +@cli_osm.command(name='nsd-list', short_help='list all NS packages') @click.option('--filter', default=None, help='restricts the list to the NSD/NSpkg matching the filter') @click.pass_context @@ -261,7 +260,7 @@ def nsd_list1(ctx, filter): nsd_list(ctx, filter) -@cli.command(name='nspkg-list', short_help='list all NS packages') +@cli_osm.command(name='nspkg-list', short_help='list all NS packages') @click.option('--filter', default=None, help='restricts the list to the NSD/NSpkg matching the filter') @click.pass_context @@ -306,7 +305,7 @@ def vnfd_list(ctx, nf_type, filter): print(table) -@cli.command(name='vnfd-list', short_help='list all xNF packages (VNF, HNF, PNF)') +@cli_osm.command(name='vnfd-list', short_help='list all xNF packages (VNF, HNF, PNF)') @click.option('--nf_type', help='type of NF (vnf, pnf, hnf)') @click.option('--filter', default=None, help='restricts the list to the NF pkg matching the filter') @@ -316,7 +315,7 @@ def vnfd_list1(ctx, nf_type, filter): vnfd_list(ctx, nf_type, filter) -@cli.command(name='vnfpkg-list', short_help='list all xNF packages (VNF, HNF, PNF)') +@cli_osm.command(name='vnfpkg-list', short_help='list all xNF packages (VNF, HNF, PNF)') @click.option('--nf_type', help='type of NF (vnf, pnf, hnf)') @click.option('--filter', default=None, help='restricts the list to the NFpkg matching the filter') @@ -326,34 +325,34 @@ def vnfd_list2(ctx, nf_type, filter): vnfd_list(ctx, nf_type, filter) -@cli.command(name='nfpkg-list', short_help='list all xNF packages (VNF, HNF, PNF)') +@cli_osm.command(name='nfpkg-list', short_help='list all xNF packages (VNF, HNF, PNF)') @click.option('--nf_type', help='type of NF (vnf, pnf, hnf)') @click.option('--filter', default=None, help='restricts the list to the NFpkg matching the filter') @click.pass_context def nfpkg_list(ctx, nf_type, filter): """list all xNF packages (VNF, HNF, PNF)""" - try: - check_client_version(ctx.obj, ctx.command.name) - vnfd_list(ctx, nf_type, filter) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + vnfd_list(ctx, nf_type, filter) + # except ClientException as e: + # print(str(e)) + # exit(1) def vnf_list(ctx, ns, filter): - try: - if ns or filter: - if ns: - check_client_version(ctx.obj, '--ns') - if filter: - check_client_version(ctx.obj, '--filter') - resp = ctx.obj.vnf.list(ns, filter) - else: - resp = ctx.obj.vnf.list() - except ClientException as e: - print(str(e)) - exit(1) + # try: + if ns or filter: + if ns: + check_client_version(ctx.obj, '--ns') + if filter: + check_client_version(ctx.obj, '--filter') + resp = ctx.obj.vnf.list(ns, filter) + else: + resp = ctx.obj.vnf.list() + # except ClientException as e: + # print(str(e)) + # exit(1) fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__ if fullclassname == 'osmclient.sol005.client.Client': table = PrettyTable( @@ -393,7 +392,7 @@ def vnf_list(ctx, ns, filter): print(table) -@cli.command(name='vnf-list', short_help='list all NF instances') +@cli_osm.command(name='vnf-list', short_help='list all NF instances') @click.option('--ns', default=None, help='NS instance id or name to restrict the NF list') @click.option('--filter', default=None, help='restricts the list to the NF instances matching the filter.') @@ -403,7 +402,7 @@ def vnf_list1(ctx, ns, filter): vnf_list(ctx, ns, filter) -@cli.command(name='nf-list', short_help='list all NF instances') +@cli_osm.command(name='nf-list', short_help='list all NF instances') @click.option('--ns', default=None, help='NS instance id or name to restrict the NF list') @click.option('--filter', default=None, help='restricts the list to the NF instances matching the filter.') @@ -459,7 +458,7 @@ def nf_list(ctx, ns, filter): vnf_list(ctx, ns, filter) -@cli.command(name='ns-op-list', short_help='shows the history of operations over a NS instance') +@cli_osm.command(name='ns-op-list', short_help='shows the history of operations over a NS instance') @click.argument('name') @click.pass_context def ns_op_list(ctx, name): @@ -467,12 +466,12 @@ def ns_op_list(ctx, name): NAME: name or ID of the NS instance """ - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.ns.list_op(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.ns.list_op(name) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['id', 'operation', 'action_name', 'status']) #print(yaml.safe_dump(resp)) @@ -488,12 +487,12 @@ def ns_op_list(ctx, name): def nsi_list(ctx, filter): """list all Network Slice Instances""" - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.nsi.list(filter) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.nsi.list(filter) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable( ['netslice instance name', 'id', @@ -518,7 +517,7 @@ def nsi_list(ctx, filter): print(table) -@cli.command(name='nsi-list', short_help='list all Network Slice Instances (NSI)') +@cli_osm.command(name='nsi-list', short_help='list all Network Slice Instances (NSI)') @click.option('--filter', default=None, help='restricts the list to the Network Slice Instances matching the filter') @click.pass_context @@ -527,7 +526,7 @@ def nsi_list1(ctx, filter): nsi_list(ctx, filter) -@cli.command(name='netslice-instance-list', short_help='list all Network Slice Instances (NSI)') +@cli_osm.command(name='netslice-instance-list', short_help='list all Network Slice Instances (NSI)') @click.option('--filter', default=None, help='restricts the list to the Network Slice Instances matching the filter') @click.pass_context @@ -537,12 +536,12 @@ def nsi_list2(ctx, filter): def nst_list(ctx, filter): - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.nst.list(filter) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.nst.list(filter) + # except ClientException as e: + # print(str(e)) + # exit(1) # print(yaml.safe_dump(resp)) table = PrettyTable(['nst name', 'id']) for nst in resp: @@ -552,7 +551,7 @@ def nst_list(ctx, filter): print(table) -@cli.command(name='nst-list', short_help='list all Network Slice Templates (NST)') +@cli_osm.command(name='nst-list', short_help='list all Network Slice Templates (NST)') @click.option('--filter', default=None, help='restricts the list to the NST matching the filter') @click.pass_context @@ -561,7 +560,7 @@ def nst_list1(ctx, filter): nst_list(ctx, filter) -@cli.command(name='netslice-template-list', short_help='list all Network Slice Templates (NST)') +@cli_osm.command(name='netslice-template-list', short_help='list all Network Slice Templates (NST)') @click.option('--filter', default=None, help='restricts the list to the NST matching the filter') @click.pass_context @@ -571,12 +570,12 @@ def nst_list2(ctx, filter): def nsi_op_list(ctx, name): - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.nsi.list_op(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.nsi.list_op(name) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['id', 'operation', 'status']) for op in resp: table.add_row([op['id'], op['lcmOperationType'], @@ -585,7 +584,7 @@ def nsi_op_list(ctx, name): print(table) -@cli.command(name='nsi-op-list', short_help='shows the history of operations over a Network Slice Instance (NSI)') +@cli_osm.command(name='nsi-op-list', short_help='shows the history of operations over a Network Slice Instance (NSI)') @click.argument('name') @click.pass_context def nsi_op_list1(ctx, name): @@ -596,7 +595,7 @@ def nsi_op_list1(ctx, name): nsi_op_list(ctx, name) -@cli.command(name='netslice-instance-op-list', short_help='shows the history of operations over a Network Slice Instance (NSI)') +@cli_osm.command(name='netslice-instance-op-list', short_help='shows the history of operations over a Network Slice Instance (NSI)') @click.argument('name') @click.pass_context def nsi_op_list2(ctx, name): @@ -607,18 +606,18 @@ def nsi_op_list2(ctx, name): nsi_op_list(ctx, name) -@cli.command(name='pdu-list', short_help='list all Physical Deployment Units (PDU)') +@cli_osm.command(name='pdu-list', short_help='list all Physical Deployment Units (PDU)') @click.option('--filter', default=None, help='restricts the list to the Physical Deployment Units matching the filter') @click.pass_context def pdu_list(ctx, filter): """list all Physical Deployment Units (PDU)""" - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.pdu.list(filter) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.pdu.list(filter) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable( ['pdu name', 'id', @@ -647,12 +646,12 @@ def pdu_list(ctx, filter): #################### def nsd_show(ctx, name, literal): - try: - resp = ctx.obj.nsd.get(name) - # resp = ctx.obj.nsd.get_individual(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + resp = ctx.obj.nsd.get(name) + # resp = ctx.obj.nsd.get_individual(name) + # except ClientException as e: + # print(str(e)) + # exit(1) if literal: print(yaml.safe_dump(resp)) @@ -665,7 +664,7 @@ def nsd_show(ctx, name, literal): print(table) -@cli.command(name='nsd-show', short_help='shows the content of a NSD') +@cli_osm.command(name='nsd-show', short_help='shows the content of a NSD') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @click.argument('name') @@ -678,7 +677,7 @@ def nsd_show1(ctx, name, literal): nsd_show(ctx, name, literal) -@cli.command(name='nspkg-show', short_help='shows the content of a NSD') +@cli_osm.command(name='nspkg-show', short_help='shows the content of a NSD') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @click.argument('name') @@ -692,12 +691,12 @@ def nsd_show2(ctx, name, literal): def vnfd_show(ctx, name, literal): - try: - resp = ctx.obj.vnfd.get(name) - # resp = ctx.obj.vnfd.get_individual(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + resp = ctx.obj.vnfd.get(name) + # resp = ctx.obj.vnfd.get_individual(name) + # except ClientException as e: + # print(str(e)) + # exit(1) if literal: print(yaml.safe_dump(resp)) @@ -710,7 +709,7 @@ def vnfd_show(ctx, name, literal): print(table) -@cli.command(name='vnfd-show', short_help='shows the content of a VNFD') +@cli_osm.command(name='vnfd-show', short_help='shows the content of a VNFD') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @click.argument('name') @@ -723,7 +722,7 @@ def vnfd_show1(ctx, name, literal): vnfd_show(ctx, name, literal) -@cli.command(name='vnfpkg-show', short_help='shows the content of a VNFD') +@cli_osm.command(name='vnfpkg-show', short_help='shows the content of a VNFD') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @click.argument('name') @@ -736,7 +735,7 @@ def vnfd_show2(ctx, name, literal): vnfd_show(ctx, name, literal) -@cli.command(name='nfpkg-show', short_help='shows the content of a NF Descriptor') +@cli_osm.command(name='nfpkg-show', short_help='shows the content of a NF Descriptor') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @click.argument('name') @@ -749,7 +748,7 @@ def nfpkg_show(ctx, name, literal): vnfd_show(ctx, name, literal) -@cli.command(name='ns-show', short_help='shows the info of a NS instance') +@cli_osm.command(name='ns-show', short_help='shows the info of a NS instance') @click.argument('name') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @@ -760,11 +759,11 @@ def ns_show(ctx, name, literal, filter): NAME: name or ID of the NS instance """ - try: - ns = ctx.obj.ns.get(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + ns = ctx.obj.ns.get(name) + # except ClientException as e: + # print(str(e)) + # exit(1) if literal: print(yaml.safe_dump(ns)) @@ -787,7 +786,7 @@ def ns_show(ctx, name, literal, filter): print(table) -@cli.command(name='vnf-show', short_help='shows the info of a VNF instance') +@cli_osm.command(name='vnf-show', short_help='shows the info of a VNF instance') @click.argument('name') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @@ -805,45 +804,45 @@ def vnf_show(ctx, name, literal, filter, kdu): if filter: raise ClientException('"--filter" option is incompatible with "--kdu" option') - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.vnf.get(name) - - if kdu: - ns_id = resp['nsr-id-ref'] - op_data={} - op_data['member_vnf_index'] = resp['member-vnf-index-ref'] - op_data['kdu_name'] = kdu - op_data['primitive'] = 'status' - op_data['primitive_params'] = {} - op_id = ctx.obj.ns.exec_op(ns_id, op_name='action', op_data=op_data, wait=False) - t = 0 - while t<30: - op_info = ctx.obj.ns.get_op(op_id) - if op_info['operationState'] == 'COMPLETED': - print(op_info['detailed-status']) - return - time.sleep(5) - t += 5 - print ("Could not determine KDU status") + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.vnf.get(name) - if literal: - print(yaml.safe_dump(resp)) - return + if kdu: + ns_id = resp['nsr-id-ref'] + op_data={} + op_data['member_vnf_index'] = resp['member-vnf-index-ref'] + op_data['kdu_name'] = kdu + op_data['primitive'] = 'status' + op_data['primitive_params'] = {} + op_id = ctx.obj.ns.exec_op(ns_id, op_name='action', op_data=op_data, wait=False) + t = 0 + while t<30: + op_info = ctx.obj.ns.get_op(op_id) + if op_info['operationState'] == 'COMPLETED': + print(op_info['detailed-status']) + return + time.sleep(5) + t += 5 + print ("Could not determine KDU status") - table = PrettyTable(['field', 'value']) + if literal: + print(yaml.safe_dump(resp)) + return - for k, v in list(resp.items()): - if filter is None or filter in k: - table.add_row([k, wrap_text(text=json.dumps(v,indent=2),width=100)]) - table.align = 'l' - print(table) - except ClientException as e: - print(str(e)) - exit(1) + table = PrettyTable(['field', 'value']) + + for k, v in list(resp.items()): + if filter is None or filter in k: + table.add_row([k, wrap_text(text=json.dumps(v,indent=2),width=100)]) + table.align = 'l' + print(table) + # except ClientException as e: + # print(str(e)) + # exit(1) -#@cli.command(name='vnf-monitoring-show') +#@cli_osm.command(name='vnf-monitoring-show') #@click.argument('vnf_name') #@click.pass_context #def vnf_monitoring_show(ctx, vnf_name): @@ -866,7 +865,7 @@ def vnf_show(ctx, name, literal, filter, kdu): # print(table) -#@cli.command(name='ns-monitoring-show') +#@cli_osm.command(name='ns-monitoring-show') #@click.argument('ns_name') #@click.pass_context #def ns_monitoring_show(ctx, ns_name): @@ -889,7 +888,7 @@ def vnf_show(ctx, name, literal, filter, kdu): # print(table) -@cli.command(name='ns-op-show', short_help='shows the info of a NS operation') +@cli_osm.command(name='ns-op-show', short_help='shows the info of a NS operation') @click.argument('id') @click.option('--filter', default=None) @click.option('--literal', is_flag=True, @@ -900,12 +899,12 @@ def ns_op_show(ctx, id, filter, literal): ID: operation identifier """ - try: - check_client_version(ctx.obj, ctx.command.name) - op_info = ctx.obj.ns.get_op(id) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + op_info = ctx.obj.ns.get_op(id) + # except ClientException as e: + # print(str(e)) + # exit(1) if literal: print(yaml.safe_dump(op_info)) @@ -920,13 +919,13 @@ def ns_op_show(ctx, id, filter, literal): def nst_show(ctx, name, literal): - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.nst.get(name) - #resp = ctx.obj.nst.get_individual(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.nst.get(name) + #resp = ctx.obj.nst.get_individual(name) + # except ClientException as e: + # print(str(e)) + # exit(1) if literal: print(yaml.safe_dump(resp)) @@ -939,7 +938,7 @@ def nst_show(ctx, name, literal): print(table) -@cli.command(name='nst-show', short_help='shows the content of a Network Slice Template (NST)') +@cli_osm.command(name='nst-show', short_help='shows the content of a Network Slice Template (NST)') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @click.argument('name') @@ -952,7 +951,7 @@ def nst_show1(ctx, name, literal): nst_show(ctx, name, literal) -@cli.command(name='netslice-template-show', short_help='shows the content of a Network Slice Template (NST)') +@cli_osm.command(name='netslice-template-show', short_help='shows the content of a Network Slice Template (NST)') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @click.argument('name') @@ -966,12 +965,12 @@ def nst_show2(ctx, name, literal): def nsi_show(ctx, name, literal, filter): - try: - check_client_version(ctx.obj, ctx.command.name) - nsi = ctx.obj.nsi.get(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + nsi = ctx.obj.nsi.get(name) + # except ClientException as e: + # print(str(e)) + # exit(1) if literal: print(yaml.safe_dump(nsi)) @@ -987,7 +986,7 @@ def nsi_show(ctx, name, literal, filter): print(table) -@cli.command(name='nsi-show', short_help='shows the content of a Network Slice Instance (NSI)') +@cli_osm.command(name='nsi-show', short_help='shows the content of a Network Slice Instance (NSI)') @click.argument('name') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @@ -1001,7 +1000,7 @@ def nsi_show1(ctx, name, literal, filter): nsi_show(ctx, name, literal, filter) -@cli.command(name='netslice-instance-show', short_help='shows the content of a Network Slice Instance (NSI)') +@cli_osm.command(name='netslice-instance-show', short_help='shows the content of a Network Slice Instance (NSI)') @click.argument('name') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @@ -1016,12 +1015,12 @@ def nsi_show2(ctx, name, literal, filter): def nsi_op_show(ctx, id, filter): - try: - check_client_version(ctx.obj, ctx.command.name) - op_info = ctx.obj.nsi.get_op(id) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + op_info = ctx.obj.nsi.get_op(id) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['field', 'value']) for k, v in list(op_info.items()): @@ -1031,7 +1030,7 @@ def nsi_op_show(ctx, id, filter): print(table) -@cli.command(name='nsi-op-show', short_help='shows the info of an operation over a Network Slice Instance(NSI)') +@cli_osm.command(name='nsi-op-show', short_help='shows the info of an operation over a Network Slice Instance(NSI)') @click.argument('id') @click.option('--filter', default=None) @click.pass_context @@ -1043,7 +1042,7 @@ def nsi_op_show1(ctx, id, filter): nsi_op_show(ctx, id, filter) -@cli.command(name='netslice-instance-op-show', short_help='shows the info of an operation over a Network Slice Instance(NSI)') +@cli_osm.command(name='netslice-instance-op-show', short_help='shows the info of an operation over a Network Slice Instance(NSI)') @click.argument('id') @click.option('--filter', default=None) @click.pass_context @@ -1055,7 +1054,7 @@ def nsi_op_show2(ctx, id, filter): nsi_op_show(ctx, id, filter) -@cli.command(name='pdu-show', short_help='shows the content of a Physical Deployment Unit (PDU)') +@cli_osm.command(name='pdu-show', short_help='shows the content of a Physical Deployment Unit (PDU)') @click.argument('name') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @@ -1066,12 +1065,12 @@ def pdu_show(ctx, name, literal, filter): NAME: name or ID of the PDU """ - try: - check_client_version(ctx.obj, ctx.command.name) - pdu = ctx.obj.pdu.get(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + pdu = ctx.obj.pdu.get(name) + # except ClientException as e: + # print(str(e)) + # exit(1) if literal: print(yaml.safe_dump(pdu)) @@ -1092,15 +1091,15 @@ def pdu_show(ctx, name, literal, filter): #################### def nsd_create(ctx, filename, overwrite): - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.nsd.create(filename, overwrite) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.nsd.create(filename, overwrite) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='nsd-create', short_help='creates a new NSD/NSpkg') +@cli_osm.command(name='nsd-create', short_help='creates a new NSD/NSpkg') @click.argument('filename') @click.option('--overwrite', 'overwrite', default=None, hidden=True, help='Deprecated. Use override') @@ -1116,7 +1115,7 @@ def nsd_create1(ctx, filename, overwrite): nsd_create(ctx, filename, overwrite) -@cli.command(name='nspkg-create', short_help='creates a new NSD/NSpkg') +@cli_osm.command(name='nspkg-create', short_help='creates a new NSD/NSpkg') @click.argument('filename') @click.option('--overwrite', 'overwrite', default=None, hidden=True, help='Deprecated. Use override') @@ -1133,15 +1132,15 @@ def nsd_create2(ctx, filename, overwrite): def vnfd_create(ctx, filename, overwrite): - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.vnfd.create(filename, overwrite) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.vnfd.create(filename, overwrite) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='vnfd-create', short_help='creates a new VNFD/VNFpkg') +@cli_osm.command(name='vnfd-create', short_help='creates a new VNFD/VNFpkg') @click.argument('filename') @click.option('--overwrite', 'overwrite', default=None, help='overwrite deprecated, use override') @@ -1157,7 +1156,7 @@ def vnfd_create1(ctx, filename, overwrite): vnfd_create(ctx, filename, overwrite) -@cli.command(name='vnfpkg-create', short_help='creates a new VNFD/VNFpkg') +@cli_osm.command(name='vnfpkg-create', short_help='creates a new VNFD/VNFpkg') @click.argument('filename') @click.option('--overwrite', 'overwrite', default=None, hidden=True, help='Deprecated. Use override') @@ -1173,7 +1172,7 @@ def vnfd_create2(ctx, filename, overwrite): vnfd_create(ctx, filename, overwrite) -@cli.command(name='nfpkg-create', short_help='creates a new NFpkg') +@cli_osm.command(name='nfpkg-create', short_help='creates a new NFpkg') @click.argument('filename') @click.option('--overwrite', 'overwrite', default=None, hidden=True, help='Deprecated. Use override') @@ -1189,7 +1188,7 @@ def nfpkg_create(ctx, filename, overwrite): vnfd_create(ctx, filename, overwrite) -@cli.command(name='ns-create', short_help='creates a new Network Service instance') +@cli_osm.command(name='ns-create', short_help='creates a new Network Service instance') @click.option('--ns_name', prompt=True, help='name of the NS instance') @click.option('--nsd_name', @@ -1225,35 +1224,35 @@ def ns_create(ctx, config_file, wait): """creates a new NS instance""" - try: - if config_file: - check_client_version(ctx.obj, '--config_file') - if config: - raise ClientException('"--config" option is incompatible with "--config_file" option') - with open(config_file, 'r') as cf: - config=cf.read() - ctx.obj.ns.create( - nsd_name, - ns_name, - config=config, - ssh_keys=ssh_keys, - account=vim_account, - wait=wait) - except ClientException as e: - print(str(e)) - exit(1) + # try: + if config_file: + check_client_version(ctx.obj, '--config_file') + if config: + raise ClientException('"--config" option is incompatible with "--config_file" option') + with open(config_file, 'r') as cf: + config=cf.read() + ctx.obj.ns.create( + nsd_name, + ns_name, + config=config, + ssh_keys=ssh_keys, + account=vim_account, + wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) def nst_create(ctx, filename, overwrite): - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.nst.create(filename, overwrite) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.nst.create(filename, overwrite) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='nst-create', short_help='creates a new Network Slice Template (NST)') +@cli_osm.command(name='nst-create', short_help='creates a new Network Slice Template (NST)') @click.argument('filename') @click.option('--overwrite', 'overwrite', default=None, hidden=True, help='Deprecated. Use override') @@ -1269,7 +1268,7 @@ def nst_create1(ctx, filename, overwrite): nst_create(ctx, filename, overwrite) -@cli.command(name='netslice-template-create', short_help='creates a new Network Slice Template (NST)') +@cli_osm.command(name='netslice-template-create', short_help='creates a new Network Slice Template (NST)') @click.argument('filename') @click.option('--overwrite', 'overwrite', default=None, hidden=True, help='Deprecated. Use override') @@ -1287,21 +1286,21 @@ def nst_create2(ctx, filename, overwrite): 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) - if config_file: - if config: - raise ClientException('"--config" option is incompatible with "--config_file" option') - 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, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) - - -@cli.command(name='nsi-create', short_help='creates a new Network Slice Instance') + # try: + check_client_version(ctx.obj, ctx.command.name) + if config_file: + if config: + raise ClientException('"--config" option is incompatible with "--config_file" option') + 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, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) + + +@cli_osm.command(name='nsi-create', short_help='creates a new Network Slice Instance') @click.option('--nsi_name', prompt=True, help='name of the Network Slice Instance') @click.option('--nst_name', prompt=True, help='name of the Network Slice Template') @click.option('--vim_account', prompt=True, help='default VIM account id or name for the deployment') @@ -1333,7 +1332,7 @@ def nsi_create1(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_f 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') +@cli_osm.command(name='netslice-instance-create', short_help='creates a new Network Slice Instance') @click.option('--nsi_name', prompt=True, help='name of the Network Slice Instance') @click.option('--nst_name', prompt=True, help='name of the Network Slice Template') @click.option('--vim_account', prompt=True, help='default VIM account id or name for the deployment') @@ -1363,7 +1362,7 @@ def nsi_create2(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_f 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') +@cli_osm.command(name='pdu-create', short_help='adds a new Physical Deployment Unit to the catalog') @click.option('--name', help='name of the Physical Deployment Unit') @click.option('--pdu_type', help='type of PDU (e.g. router, firewall, FW001)') @click.option('--interface', @@ -1377,51 +1376,51 @@ def nsi_create2(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_f @click.pass_context def pdu_create(ctx, name, pdu_type, interface, description, vim_account, descriptor_file): """creates a new Physical Deployment Unit (PDU)""" - try: - check_client_version(ctx.obj, ctx.command.name) - pdu = {} - if not descriptor_file: - if not name: - raise ClientException('in absence of descriptor file, option "--name" is mandatory') - if not pdu_type: - raise ClientException('in absence of descriptor file, option "--pdu_type" is mandatory') - if not interface: - raise ClientException('in absence of descriptor file, option "--interface" is mandatory (at least once)') - if not vim_account: - raise ClientException('in absence of descriptor file, option "--vim_account" is mandatory (at least once)') - else: - with open(descriptor_file, 'r') as df: - pdu = yaml.safe_load(df.read()) - if name: pdu["name"] = name - if pdu_type: pdu["type"] = pdu_type - if description: pdu["description"] = description - if vim_account: pdu["vim_accounts"] = vim_account - if interface: - ifaces_list = [] - for iface in interface: - new_iface={k:v for k,v in [i.split('=') for i in iface.split(',')]} - new_iface["mgmt"] = (new_iface.get("mgmt","false").lower() == "true") - ifaces_list.append(new_iface) - pdu["interfaces"] = ifaces_list - ctx.obj.pdu.create(pdu) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + pdu = {} + if not descriptor_file: + if not name: + raise ClientException('in absence of descriptor file, option "--name" is mandatory') + if not pdu_type: + raise ClientException('in absence of descriptor file, option "--pdu_type" is mandatory') + if not interface: + raise ClientException('in absence of descriptor file, option "--interface" is mandatory (at least once)') + if not vim_account: + raise ClientException('in absence of descriptor file, option "--vim_account" is mandatory (at least once)') + else: + with open(descriptor_file, 'r') as df: + pdu = yaml.safe_load(df.read()) + if name: pdu["name"] = name + if pdu_type: pdu["type"] = pdu_type + if description: pdu["description"] = description + if vim_account: pdu["vim_accounts"] = vim_account + if interface: + ifaces_list = [] + for iface in interface: + new_iface={k:v for k,v in [i.split('=') for i in iface.split(',')]} + new_iface["mgmt"] = (new_iface.get("mgmt","false").lower() == "true") + ifaces_list.append(new_iface) + pdu["interfaces"] = ifaces_list + ctx.obj.pdu.create(pdu) + # except ClientException as e: + # print(str(e)) + # exit(1) #################### # UPDATE operations #################### def nsd_update(ctx, name, content): - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.nsd.update(name, content) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.nsd.update(name, content) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='nsd-update', short_help='updates a NSD/NSpkg') +@cli_osm.command(name='nsd-update', short_help='updates a NSD/NSpkg') @click.argument('name') @click.option('--content', default=None, help='filename with the NSD/NSpkg replacing the current one') @@ -1434,7 +1433,7 @@ def nsd_update1(ctx, name, content): nsd_update(ctx, name, content) -@cli.command(name='nspkg-update', short_help='updates a NSD/NSpkg') +@cli_osm.command(name='nspkg-update', short_help='updates a NSD/NSpkg') @click.argument('name') @click.option('--content', default=None, help='filename with the NSD/NSpkg replacing the current one') @@ -1448,15 +1447,15 @@ def nsd_update2(ctx, name, content): def vnfd_update(ctx, name, content): - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.vnfd.update(name, content) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.vnfd.update(name, content) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='vnfd-update', short_help='updates a new VNFD/VNFpkg') +@cli_osm.command(name='vnfd-update', short_help='updates a new VNFD/VNFpkg') @click.argument('name') @click.option('--content', default=None, help='filename with the VNFD/VNFpkg replacing the current one') @@ -1469,7 +1468,7 @@ def vnfd_update1(ctx, name, content): vnfd_update(ctx, name, content) -@cli.command(name='vnfpkg-update', short_help='updates a VNFD/VNFpkg') +@cli_osm.command(name='vnfpkg-update', short_help='updates a VNFD/VNFpkg') @click.argument('name') @click.option('--content', default=None, help='filename with the VNFD/VNFpkg replacing the current one') @@ -1482,7 +1481,7 @@ def vnfd_update2(ctx, name, content): vnfd_update(ctx, name, content) -@cli.command(name='nfpkg-update', short_help='updates a NFpkg') +@cli_osm.command(name='nfpkg-update', short_help='updates a NFpkg') @click.argument('name') @click.option('--content', default=None, help='filename with the NFpkg replacing the current one') @@ -1496,15 +1495,15 @@ def nfpkg_update(ctx, name, content): def nst_update(ctx, name, content): - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.nst.update(name, content) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.nst.update(name, content) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='nst-update', short_help='updates a Network Slice Template (NST)') +@cli_osm.command(name='nst-update', short_help='updates a Network Slice Template (NST)') @click.argument('name') @click.option('--content', default=None, help='filename with the NST/NSTpkg replacing the current one') @@ -1517,7 +1516,7 @@ def nst_update1(ctx, name, content): nst_update(ctx, name, content) -@cli.command(name='netslice-template-update', short_help='updates a Network Slice Template (NST)') +@cli_osm.command(name='netslice-template-update', short_help='updates a Network Slice Template (NST)') @click.argument('name') @click.option('--content', default=None, help='filename with the NST/NSTpkg replacing the current one') @@ -1535,18 +1534,18 @@ def nst_update2(ctx, name, content): #################### def nsd_delete(ctx, name, force): - try: - if not force: - ctx.obj.nsd.delete(name) - else: - check_client_version(ctx.obj, '--force') - ctx.obj.nsd.delete(name, force) - except ClientException as e: - print(str(e)) - exit(1) + # try: + if not force: + ctx.obj.nsd.delete(name) + else: + check_client_version(ctx.obj, '--force') + ctx.obj.nsd.delete(name, force) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='nsd-delete', short_help='deletes a NSD/NSpkg') +@cli_osm.command(name='nsd-delete', short_help='deletes a NSD/NSpkg') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -1558,7 +1557,7 @@ def nsd_delete1(ctx, name, force): nsd_delete(ctx, name, force) -@cli.command(name='nspkg-delete', short_help='deletes a NSD/NSpkg') +@cli_osm.command(name='nspkg-delete', short_help='deletes a NSD/NSpkg') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -1571,18 +1570,18 @@ def nsd_delete2(ctx, name, force): def vnfd_delete(ctx, name, force): - try: - if not force: - ctx.obj.vnfd.delete(name) - else: - check_client_version(ctx.obj, '--force') - ctx.obj.vnfd.delete(name, force) - except ClientException as e: - print(str(e)) - exit(1) + # try: + if not force: + ctx.obj.vnfd.delete(name) + else: + check_client_version(ctx.obj, '--force') + ctx.obj.vnfd.delete(name, force) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='vnfd-delete', short_help='deletes a VNFD/VNFpkg') +@cli_osm.command(name='vnfd-delete', short_help='deletes a VNFD/VNFpkg') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -1594,7 +1593,7 @@ def vnfd_delete1(ctx, name, force): vnfd_delete(ctx, name, force) -@cli.command(name='vnfpkg-delete', short_help='deletes a VNFD/VNFpkg') +@cli_osm.command(name='vnfpkg-delete', short_help='deletes a VNFD/VNFpkg') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -1606,7 +1605,7 @@ def vnfd_delete2(ctx, name, force): vnfd_delete(ctx, name, force) -@cli.command(name='nfpkg-delete', short_help='deletes a NFpkg') +@cli_osm.command(name='nfpkg-delete', short_help='deletes a NFpkg') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -1618,7 +1617,7 @@ def nfpkg_delete(ctx, name, force): vnfd_delete(ctx, name, force) -@cli.command(name='ns-delete', short_help='deletes a NS instance') +@cli_osm.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', @@ -1633,27 +1632,27 @@ def ns_delete(ctx, name, force, wait): NAME: name or ID of the NS instance to be deleted """ - try: - if not force: - ctx.obj.ns.delete(name, wait=wait) - else: - check_client_version(ctx.obj, '--force') - ctx.obj.ns.delete(name, force, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) + # try: + if not force: + ctx.obj.ns.delete(name, wait=wait) + else: + check_client_version(ctx.obj, '--force') + ctx.obj.ns.delete(name, force, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) def nst_delete(ctx, name, force): - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.nst.delete(name, force) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.nst.delete(name, force) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='nst-delete', short_help='deletes a Network Slice Template (NST)') +@cli_osm.command(name='nst-delete', short_help='deletes a Network Slice Template (NST)') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -1665,7 +1664,7 @@ def nst_delete1(ctx, name, force): nst_delete(ctx, name, force) -@cli.command(name='netslice-template-delete', short_help='deletes a Network Slice Template (NST)') +@cli_osm.command(name='netslice-template-delete', short_help='deletes a Network Slice Template (NST)') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -1678,15 +1677,15 @@ def nst_delete2(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, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.nsi.delete(name, force, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='nsi-delete', short_help='deletes a Network Slice Instance (NSI)') +@cli_osm.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', @@ -1704,7 +1703,7 @@ def nsi_delete1(ctx, name, force, wait): nsi_delete(ctx, name, force, wait=wait) -@cli.command(name='netslice-instance-delete', short_help='deletes a Network Slice Instance (NSI)') +@cli_osm.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 @@ -1716,7 +1715,7 @@ def nsi_delete2(ctx, name, force, wait): nsi_delete(ctx, name, force, wait=wait) -@cli.command(name='pdu-delete', short_help='deletes a Physical Deployment Unit (PDU)') +@cli_osm.command(name='pdu-delete', short_help='deletes a Physical Deployment Unit (PDU)') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -1725,19 +1724,19 @@ def pdu_delete(ctx, name, force): NAME: name or ID of the PDU to be deleted """ - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.pdu.delete(name, force) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.pdu.delete(name, force) + # except ClientException as e: + # print(str(e)) + # exit(1) ################# # VIM operations ################# -@cli.command(name='vim-create', short_help='creates a new VIM account') +@cli_osm.command(name='vim-create', short_help='creates a new VIM account') @click.option('--name', prompt=True, help='Name to create datacenter') @@ -1786,29 +1785,29 @@ def vim_create(ctx, sdn_port_mapping, wait): """creates a new VIM account""" - try: - if sdn_controller: - check_client_version(ctx.obj, '--sdn_controller') - if sdn_port_mapping: - check_client_version(ctx.obj, '--sdn_port_mapping') - vim = {} - vim['vim-username'] = user - vim['vim-password'] = password - vim['vim-url'] = auth_url - vim['vim-tenant-name'] = tenant - vim['vim-type'] = account_type - vim['description'] = description - vim['config'] = config - if sdn_controller or sdn_port_mapping: - ctx.obj.vim.create(name, vim, sdn_controller, sdn_port_mapping, wait=wait) - else: - ctx.obj.vim.create(name, vim, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) + # try: + if sdn_controller: + check_client_version(ctx.obj, '--sdn_controller') + if sdn_port_mapping: + check_client_version(ctx.obj, '--sdn_port_mapping') + vim = {} + vim['vim-username'] = user + vim['vim-password'] = password + vim['vim-url'] = auth_url + vim['vim-tenant-name'] = tenant + vim['vim-type'] = account_type + vim['description'] = description + vim['config'] = config + if sdn_controller or sdn_port_mapping: + ctx.obj.vim.create(name, vim, sdn_controller, sdn_port_mapping, wait=wait) + else: + ctx.obj.vim.create(name, vim, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='vim-update', short_help='updates a VIM account') +@cli_osm.command(name='vim-update', short_help='updates a VIM account') @click.argument('name') @click.option('--newname', help='New name for the VIM account') @click.option('--user', help='VIM username') @@ -1844,24 +1843,24 @@ def vim_update(ctx, NAME: name or ID of the VIM account """ - try: - check_client_version(ctx.obj, ctx.command.name) - vim = {} - if newname: vim['name'] = newname - if user: vim['vim_user'] = user - if password: vim['vim_password'] = password - if auth_url: vim['vim_url'] = auth_url - if tenant: vim['vim-tenant-name'] = tenant - 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, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) - - -@cli.command(name='vim-delete', short_help='deletes a VIM account') + # try: + check_client_version(ctx.obj, ctx.command.name) + vim = {} + if newname: vim['name'] = newname + if user: vim['vim_user'] = user + if password: vim['vim_password'] = password + if auth_url: vim['vim_url'] = auth_url + if tenant: vim['vim-tenant-name'] = tenant + 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, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) + + +@cli_osm.command(name='vim-delete', short_help='deletes a VIM account') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.option('--wait', @@ -1876,18 +1875,18 @@ def vim_delete(ctx, name, force, wait): NAME: name or ID of the VIM account to be deleted """ - try: - if not force: - ctx.obj.vim.delete(name, wait=wait) - else: - check_client_version(ctx.obj, '--force') - ctx.obj.vim.delete(name, force, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) + # try: + if not force: + ctx.obj.vim.delete(name, wait=wait) + else: + check_client_version(ctx.obj, '--force') + ctx.obj.vim.delete(name, force, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='vim-list', short_help='list all VIM accounts') +@cli_osm.command(name='vim-list', short_help='list all VIM accounts') #@click.option('--ro_update/--no_ro_update', # default=False, # help='update list from RO') @@ -1912,7 +1911,7 @@ def vim_list(ctx, filter): print(table) -@cli.command(name='vim-show', short_help='shows the details of a VIM account') +@cli_osm.command(name='vim-show', short_help='shows the details of a VIM account') @click.argument('name') @click.pass_context def vim_show(ctx, name): @@ -1920,13 +1919,13 @@ def vim_show(ctx, name): NAME: name or ID of the VIM account """ - try: - resp = ctx.obj.vim.get(name) - if 'vim_password' in resp: - resp['vim_password']='********' - except ClientException as e: - print(str(e)) - exit(1) + # try: + resp = ctx.obj.vim.get(name) + if 'vim_password' in resp: + resp['vim_password']='********' + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['key', 'attribute']) for k, v in list(resp.items()): @@ -1939,7 +1938,7 @@ def vim_show(ctx, name): # WIM operations #################### -@cli.command(name='wim-create', short_help='creates a new WIM account') +@cli_osm.command(name='wim-create', short_help='creates a new WIM account') @click.option('--name', prompt=True, help='Name for the WIM account') @@ -1982,27 +1981,27 @@ def wim_create(ctx, wim_port_mapping, wait): """creates a new WIM account""" - try: - check_client_version(ctx.obj, ctx.command.name) - # if sdn_controller: - # check_client_version(ctx.obj, '--sdn_controller') - # if sdn_port_mapping: - # check_client_version(ctx.obj, '--sdn_port_mapping') - wim = {} - if user: wim['user'] = user - if password: wim['password'] = password - if url: wim['wim_url'] = url - # if tenant: wim['tenant'] = tenant - wim['wim_type'] = wim_type - if description: wim['description'] = description - if config: wim['config'] = config - ctx.obj.wim.create(name, wim, wim_port_mapping, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) - - -@cli.command(name='wim-update', short_help='updates a WIM account') + # try: + check_client_version(ctx.obj, ctx.command.name) + # if sdn_controller: + # check_client_version(ctx.obj, '--sdn_controller') + # if sdn_port_mapping: + # check_client_version(ctx.obj, '--sdn_port_mapping') + wim = {} + if user: wim['user'] = user + if password: wim['password'] = password + if url: wim['wim_url'] = url + # if tenant: wim['tenant'] = tenant + wim['wim_type'] = wim_type + if description: wim['description'] = description + if config: wim['config'] = config + ctx.obj.wim.create(name, wim, wim_port_mapping, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) + + +@cli_osm.command(name='wim-update', short_help='updates a WIM account') @click.argument('name') @click.option('--newname', help='New name for the WIM account') @click.option('--user', help='WIM username') @@ -2035,24 +2034,24 @@ def wim_update(ctx, NAME: name or ID of the WIM account """ - try: - check_client_version(ctx.obj, ctx.command.name) - wim = {} - if newname: wim['name'] = newname - if user: wim['user'] = user - if password: wim['password'] = password - if url: wim['url'] = url - # if tenant: wim['tenant'] = tenant - 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, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) - - -@cli.command(name='wim-delete', short_help='deletes a WIM account') + # try: + check_client_version(ctx.obj, ctx.command.name) + wim = {} + if newname: wim['name'] = newname + if user: wim['user'] = user + if password: wim['password'] = password + if url: wim['url'] = url + # if tenant: wim['tenant'] = tenant + 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, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) + + +@cli_osm.command(name='wim-delete', short_help='deletes a WIM account') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.option('--wait', @@ -2066,34 +2065,34 @@ def wim_delete(ctx, name, force, wait): 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, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.wim.delete(name, force, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='wim-list', short_help='list all WIM accounts') +@cli_osm.command(name='wim-list', short_help='list all WIM accounts') @click.option('--filter', default=None, help='restricts the list to the WIM accounts matching the filter') @click.pass_context def wim_list(ctx, filter): """list all WIM accounts""" - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.wim.list(filter) - table = PrettyTable(['wim name', 'uuid']) - for wim in resp: - table.add_row([wim['name'], wim['uuid']]) - table.align = 'l' - print(table) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.wim.list(filter) + table = PrettyTable(['wim name', 'uuid']) + for wim in resp: + table.add_row([wim['name'], wim['uuid']]) + table.align = 'l' + print(table) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='wim-show', short_help='shows the details of a WIM account') +@cli_osm.command(name='wim-show', short_help='shows the details of a WIM account') @click.argument('name') @click.pass_context def wim_show(ctx, name): @@ -2101,14 +2100,14 @@ def wim_show(ctx, name): NAME: name or ID of the WIM account """ - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.wim.get(name) - if 'password' in resp: - resp['wim_password']='********' - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.wim.get(name) + if 'password' in resp: + resp['wim_password']='********' + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['key', 'attribute']) for k, v in list(resp.items()): @@ -2121,7 +2120,7 @@ def wim_show(ctx, name): # SDN controller operations #################### -@cli.command(name='sdnc-create', short_help='creates a new SDN controller') +@cli_osm.command(name='sdnc-create', short_help='creates a new SDN controller') @click.option('--name', prompt=True, help='Name to create sdn controller') @@ -2169,14 +2168,14 @@ def sdnc_create(ctx, **kwargs): if kwargs.get("sdn_controller_version"): print("option '--sdn_controller_version' is deprecated, use '---config={version: SDN_CONTROLLER_VERSION}'" " instead") - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.sdnc.create(kwargs["name"], sdncontroller, wait=kwargs["wait"]) - except ClientException as e: - print(str(e)) - exit(1) - -@cli.command(name='sdnc-update', short_help='updates an SDN controller') + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.sdnc.create(kwargs["name"], sdncontroller, wait=kwargs["wait"]) + # except ClientException as e: + # print(str(e)) + # exit(1) + +@cli_osm.command(name='sdnc-update', short_help='updates an SDN controller') @click.argument('name') @click.option('--newname', help='New name for the SDN controller') @click.option('--description', default=None, help='human readable description') @@ -2215,15 +2214,15 @@ def sdnc_update(ctx, **kwargs): print("option '--sdn_controller_version' is deprecated, use '---config={version: SDN_CONTROLLER_VERSION}'" " instead") - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.sdnc.update(kwargs["name"], sdncontroller, wait=kwargs["wait"]) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.sdnc.update(kwargs["name"], sdncontroller, wait=kwargs["wait"]) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='sdnc-delete', short_help='deletes an SDN controller') +@cli_osm.command(name='sdnc-delete', short_help='deletes an SDN controller') @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, @@ -2234,26 +2233,26 @@ def sdnc_delete(ctx, name, force, wait): 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, wait=wait) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.sdnc.delete(name, force, wait=wait) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='sdnc-list', short_help='list all SDN controllers') +@cli_osm.command(name='sdnc-list', short_help='list all SDN controllers') @click.option('--filter', default=None, help="restricts the list to the SDN controllers matching the filter with format: 'k[.k..]=v[&k[.k]=v2]'") @click.pass_context def sdnc_list(ctx, filter): """list all SDN controllers""" - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.sdnc.list(filter) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.sdnc.list(filter) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['sdnc name', 'id']) for sdnc in resp: table.add_row([sdnc['name'], sdnc['_id']]) @@ -2261,7 +2260,7 @@ def sdnc_list(ctx, filter): print(table) -@cli.command(name='sdnc-show', short_help='shows the details of an SDN controller') +@cli_osm.command(name='sdnc-show', short_help='shows the details of an SDN controller') @click.argument('name') @click.pass_context def sdnc_show(ctx, name): @@ -2269,12 +2268,12 @@ def sdnc_show(ctx, name): NAME: name or ID of the SDN controller """ - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.sdnc.get(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.sdnc.get(name) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['key', 'attribute']) for k, v in list(resp.items()): @@ -2287,7 +2286,7 @@ def sdnc_show(ctx, name): # K8s cluster operations ########################### -@cli.command(name='k8scluster-add') +@cli_osm.command(name='k8scluster-add') @click.argument('name') @click.option('--creds', prompt=True, @@ -2330,25 +2329,25 @@ def k8scluster_add(ctx, NAME: name of the K8s cluster """ - try: - check_client_version(ctx.obj, ctx.command.name) - cluster = {} - cluster['name'] = name - with open(creds, 'r') as cf: - cluster['credentials'] = yaml.safe_load(cf.read()) - cluster['k8s_version'] = version - cluster['vim_account'] = vim - cluster['nets'] = yaml.safe_load(k8s_nets) - cluster['description'] = description - if namespace: cluster['namespace'] = namespace - if cni: cluster['cni'] = yaml.safe_load(cni) - ctx.obj.k8scluster.create(name, cluster) - except ClientException as e: - print(str(e)) - exit(1) - - -@cli.command(name='k8scluster-update', short_help='updates a K8s cluster') + # try: + check_client_version(ctx.obj, ctx.command.name) + cluster = {} + cluster['name'] = name + with open(creds, 'r') as cf: + cluster['credentials'] = yaml.safe_load(cf.read()) + cluster['k8s_version'] = version + cluster['vim_account'] = vim + cluster['nets'] = yaml.safe_load(k8s_nets) + cluster['description'] = description + if namespace: cluster['namespace'] = namespace + if cni: cluster['cni'] = yaml.safe_load(cni) + ctx.obj.k8scluster.create(name, cluster) + # except ClientException as e: + # print(str(e)) + # exit(1) + + +@cli_osm.command(name='k8scluster-update', short_help='updates a K8s cluster') @click.argument('name') @click.option('--newname', help='New name for the K8s cluster') @click.option('--creds', help='credentials file, i.e. a valid `.kube/config` file') @@ -2373,26 +2372,26 @@ def k8scluster_update(ctx, NAME: name or ID of the K8s cluster """ - try: - check_client_version(ctx.obj, ctx.command.name) - cluster = {} - if newname: cluster['name'] = newname - if creds: - with open(creds, 'r') as cf: - cluster['credentials'] = yaml.safe_load(cf.read()) - if version: cluster['k8s_version'] = version - if vim: cluster['vim_account'] = vim - if k8s_nets: cluster['nets'] = yaml.safe_load(k8s_nets) - if description: cluster['description'] = description - if namespace: cluster['namespace'] = namespace - if cni: cluster['cni'] = yaml.safe_load(cni) - ctx.obj.k8scluster.update(name, cluster) - except ClientException as e: - print(str(e)) - exit(1) - - -@cli.command(name='k8scluster-delete') + # try: + check_client_version(ctx.obj, ctx.command.name) + cluster = {} + if newname: cluster['name'] = newname + if creds: + with open(creds, 'r') as cf: + cluster['credentials'] = yaml.safe_load(cf.read()) + if version: cluster['k8s_version'] = version + if vim: cluster['vim_account'] = vim + if k8s_nets: cluster['nets'] = yaml.safe_load(k8s_nets) + if description: cluster['description'] = description + if namespace: cluster['namespace'] = namespace + if cni: cluster['cni'] = yaml.safe_load(cni) + ctx.obj.k8scluster.update(name, cluster) + # except ClientException as e: + # print(str(e)) + # exit(1) + + +@cli_osm.command(name='k8scluster-delete') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion from the DB (not recommended)') #@click.option('--wait', @@ -2404,15 +2403,15 @@ def k8scluster_delete(ctx, name, force): NAME: name or ID of the K8s cluster to be deleted """ - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.k8scluster.delete(name, force=force) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.k8scluster.delete(name, force=force) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='k8scluster-list') +@cli_osm.command(name='k8scluster-list') @click.option('--filter', default=None, help='restricts the list to the K8s clusters matching the filter') @click.option('--literal', is_flag=True, @@ -2420,25 +2419,25 @@ def k8scluster_delete(ctx, name, force): @click.pass_context def k8scluster_list(ctx, filter, literal): """list all K8s clusters""" - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.k8scluster.list(filter) - if literal: - print(yaml.safe_dump(resp)) - return - table = PrettyTable(['Name', 'Id', 'Version', 'VIM', 'K8s-nets', 'Operational State', 'Description']) - for cluster in resp: - table.add_row([cluster['name'], cluster['_id'], cluster['k8s_version'], cluster['vim_account'], - json.dumps(cluster['nets']), cluster["_admin"]["operationalState"], - trunc_text(cluster.get('description',''),40)]) - table.align = 'l' - print(table) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.k8scluster.list(filter) + if literal: + print(yaml.safe_dump(resp)) + return + table = PrettyTable(['Name', 'Id', 'Version', 'VIM', 'K8s-nets', 'Operational State', 'Description']) + for cluster in resp: + table.add_row([cluster['name'], cluster['_id'], cluster['k8s_version'], cluster['vim_account'], + json.dumps(cluster['nets']), cluster["_admin"]["operationalState"], + trunc_text(cluster.get('description',''),40)]) + table.align = 'l' + print(table) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='k8scluster-show') +@cli_osm.command(name='k8scluster-show') @click.argument('name') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @@ -2448,19 +2447,19 @@ def k8scluster_show(ctx, name, literal): NAME: name or ID of the K8s cluster """ - try: - resp = ctx.obj.k8scluster.get(name) - if literal: - print(yaml.safe_dump(resp)) - return - table = PrettyTable(['key', 'attribute']) - for k, v in list(resp.items()): - table.add_row([k, wrap_text(text=json.dumps(v, indent=2),width=100)]) - table.align = 'l' - print(table) - except ClientException as e: - print(str(e)) - exit(1) + # try: + resp = ctx.obj.k8scluster.get(name) + if literal: + print(yaml.safe_dump(resp)) + return + table = PrettyTable(['key', 'attribute']) + for k, v in list(resp.items()): + table.add_row([k, wrap_text(text=json.dumps(v, indent=2),width=100)]) + table.align = 'l' + print(table) + # except ClientException as e: + # print(str(e)) + # exit(1) @@ -2468,7 +2467,7 @@ def k8scluster_show(ctx, name, literal): # Repo operations ########################### -@cli.command(name='repo-add') +@cli_osm.command(name='repo-add') @click.argument('name') @click.argument('uri') @click.option('--type', @@ -2492,20 +2491,20 @@ def repo_add(ctx, NAME: name of the repo URI: URI of the repo """ - try: - check_client_version(ctx.obj, ctx.command.name) - repo = {} - repo['name'] = name - repo['url'] = uri - repo['type'] = type - repo['description'] = description - ctx.obj.repo.create(name, repo) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + repo = {} + repo['name'] = name + repo['url'] = uri + repo['type'] = type + repo['description'] = description + ctx.obj.repo.create(name, repo) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='repo-update') +@cli_osm.command(name='repo-update') @click.argument('name') @click.option('--newname', help='New name for the repo') @click.option('--uri', help='URI of the repo') @@ -2526,20 +2525,20 @@ def repo_update(ctx, NAME: name of the repo """ - try: - check_client_version(ctx.obj, ctx.command.name) - repo = {} - if newname: repo['name'] = newname - if uri: repo['uri'] = uri - if type: repo['type'] = type - if description: repo['description'] = description - ctx.obj.repo.update(name, repo) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + repo = {} + if newname: repo['name'] = newname + if uri: repo['uri'] = uri + if type: repo['type'] = type + if description: repo['description'] = description + ctx.obj.repo.update(name, repo) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='repo-delete') +@cli_osm.command(name='repo-delete') @click.argument('name') @click.option('--force', is_flag=True, help='forces the deletion from the DB (not recommended)') #@click.option('--wait', @@ -2551,15 +2550,15 @@ def repo_delete(ctx, name, force): NAME: name or ID of the repo to be deleted """ - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.repo.delete(name, force=force) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.repo.delete(name, force=force) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='repo-list') +@cli_osm.command(name='repo-list') @click.option('--filter', default=None, help='restricts the list to the repos matching the filter') @click.option('--literal', is_flag=True, @@ -2567,24 +2566,24 @@ def repo_delete(ctx, name, force): @click.pass_context def repo_list(ctx, filter, literal): """list all repos""" - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.repo.list(filter) - if literal: - print(yaml.safe_dump(resp)) - return - table = PrettyTable(['Name', 'Id', 'Type', 'URI', 'Description']) - for repo in resp: - #cluster['k8s-nets'] = json.dumps(yaml.safe_load(cluster['k8s-nets'])) - table.add_row([repo['name'], repo['_id'], repo['type'], repo['url'], trunc_text(repo.get('description',''),40)]) - table.align = 'l' - print(table) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.repo.list(filter) + if literal: + print(yaml.safe_dump(resp)) + return + table = PrettyTable(['Name', 'Id', 'Type', 'URI', 'Description']) + for repo in resp: + #cluster['k8s-nets'] = json.dumps(yaml.safe_load(cluster['k8s-nets'])) + table.add_row([repo['name'], repo['_id'], repo['type'], repo['url'], trunc_text(repo.get('description',''),40)]) + table.align = 'l' + print(table) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='repo-show') +@cli_osm.command(name='repo-show') @click.argument('name') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @@ -2594,19 +2593,19 @@ def repo_show(ctx, name, literal): NAME: name or ID of the repo """ - try: - resp = ctx.obj.repo.get(name) - if literal: - print(yaml.safe_dump(resp)) - return - table = PrettyTable(['key', 'attribute']) - for k, v in list(resp.items()): - table.add_row([k, json.dumps(v, indent=2)]) - table.align = 'l' - print(table) - except ClientException as e: - print(str(e)) - exit(1) + # try: + resp = ctx.obj.repo.get(name) + if literal: + print(yaml.safe_dump(resp)) + return + table = PrettyTable(['key', 'attribute']) + for k, v in list(resp.items()): + table.add_row([k, json.dumps(v, indent=2)]) + table.align = 'l' + print(table) + # except ClientException as e: + # print(str(e)) + # exit(1) @@ -2614,7 +2613,7 @@ def repo_show(ctx, name, literal): # Project mgmt operations #################### -@cli.command(name='project-create', short_help='creates a new project') +@cli_osm.command(name='project-create', short_help='creates a new project') @click.argument('name') #@click.option('--description', # default='no description', @@ -2627,15 +2626,15 @@ def project_create(ctx, name): """ project = {} project['name'] = name - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.project.create(name, project) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.project.create(name, project) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='project-delete', short_help='deletes a project') +@cli_osm.command(name='project-delete', short_help='deletes a project') @click.argument('name') #@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -2644,26 +2643,26 @@ def project_delete(ctx, name): NAME: name or ID of the project to be deleted """ - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.project.delete(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.project.delete(name) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='project-list', short_help='list all projects') +@cli_osm.command(name='project-list', short_help='list all projects') @click.option('--filter', default=None, help='restricts the list to the projects matching the filter') @click.pass_context def project_list(ctx, filter): """list all projects""" - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.project.list(filter) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.project.list(filter) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['name', 'id']) for proj in resp: table.add_row([proj['name'], proj['_id']]) @@ -2671,7 +2670,7 @@ def project_list(ctx, filter): print(table) -@cli.command(name='project-show', short_help='shows the details of a project') +@cli_osm.command(name='project-show', short_help='shows the details of a project') @click.argument('name') @click.pass_context def project_show(ctx, name): @@ -2679,12 +2678,12 @@ def project_show(ctx, name): NAME: name or ID of the project """ - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.project.get(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.project.get(name) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['key', 'attribute']) for k, v in resp.items(): @@ -2693,7 +2692,7 @@ def project_show(ctx, name): print(table) -@cli.command(name='project-update', short_help='updates a project (only the name can be updated)') +@cli_osm.command(name='project-update', short_help='updates a project (only the name can be updated)') @click.argument('project') @click.option('--name', prompt=True, @@ -2713,18 +2712,18 @@ def project_update(ctx, project, name): 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 e: - print(str(e)) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.project.update(project, project_changes) + # except ClientException as e: + # print(str(e)) #################### # User mgmt operations #################### -@cli.command(name='user-create', short_help='creates a new user') +@cli_osm.command(name='user-create', short_help='creates a new user') @click.argument('username') @click.option('--password', prompt=True, @@ -2755,15 +2754,15 @@ def user_create(ctx, username, password, projects, project_role_mappings): user['projects'] = projects 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 e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.user.create(username, user) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='user-update', short_help='updates user information') +@cli_osm.command(name='user-update', short_help='updates user information') @click.argument('username') @click.option('--password', # prompt=True, @@ -2807,15 +2806,15 @@ def user_update(ctx, username, password, set_username, set_project, remove_proje user['add-project-role'] = add_project_role user['remove-project-role'] = remove_project_role - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.user.update(username, user) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.user.update(username, user) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='user-delete', short_help='deletes a user') +@cli_osm.command(name='user-delete', short_help='deletes a user') @click.argument('name') #@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -2825,26 +2824,26 @@ def user_delete(ctx, name): \b NAME: name or ID of the user to be deleted """ - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.user.delete(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.user.delete(name) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='user-list', short_help='list all users') +@cli_osm.command(name='user-list', short_help='list all users') @click.option('--filter', default=None, help='restricts the list to the users matching the filter') @click.pass_context def user_list(ctx, filter): """list all users""" - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.user.list(filter) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.user.list(filter) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['name', 'id']) for user in resp: table.add_row([user['username'], user['_id']]) @@ -2852,7 +2851,7 @@ def user_list(ctx, filter): print(table) -@cli.command(name='user-show', short_help='shows the details of a user') +@cli_osm.command(name='user-show', short_help='shows the details of a user') @click.argument('name') @click.pass_context def user_show(ctx, name): @@ -2860,14 +2859,14 @@ def user_show(ctx, name): NAME: name or ID of the user """ - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.user.get(name) - if 'password' in resp: - resp['password']='********' - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.user.get(name) + if 'password' in resp: + resp['password']='********' + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['key', 'attribute']) for k, v in resp.items(): @@ -2880,7 +2879,7 @@ def user_show(ctx, name): # Fault Management operations #################### -@cli.command(name='ns-alarm-create') +@cli_osm.command(name='ns-alarm-create') @click.argument('name') @click.option('--ns', prompt=True, help='NS instance id or name') @click.option('--vnf', prompt=True, @@ -2903,27 +2902,27 @@ def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity, """creates a new alarm for a NS instance""" # 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 e: - print(str(e)) - exit(1) - - -#@cli.command(name='ns-alarm-delete') + # 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 e: + # print(str(e)) + # exit(1) + + +#@cli_osm.command(name='ns-alarm-delete') #@click.argument('name') #@click.pass_context #def ns_alarm_delete(ctx, name): @@ -2943,7 +2942,7 @@ def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity, # Performance Management operations #################### -@cli.command(name='ns-metric-export', short_help='exports a metric to the internal OSM bus, which can be read by other apps') +@cli_osm.command(name='ns-metric-export', short_help='exports a metric to the internal OSM bus, which can be read by other apps') @click.option('--ns', prompt=True, help='NS instance id or name') @click.option('--vnf', prompt=True, help='VNF name (VNF member index as declared in the NSD)') @@ -2959,46 +2958,46 @@ 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""" # 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))) - else: - i = 1 - while True: - print('{} {}'.format(ctx.obj.ns.export_metric(metric_data),i)) - time.sleep(int(interval)) - i+=1 - except ClientException as e: - print(str(e)) - exit(1) + # 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))) + else: + i = 1 + while True: + print('{} {}'.format(ctx.obj.ns.export_metric(metric_data),i)) + time.sleep(int(interval)) + i+=1 + # except ClientException as e: + # print(str(e)) + # exit(1) #################### # Other operations #################### -@cli.command(name='version') +@cli_osm.command(name='version') @click.pass_context def get_version(ctx): - try: - check_client_version(ctx.obj, "version") - print ("Server version: {}".format(ctx.obj.get_version())) - print ("Client version: {}".format(pkg_resources.get_distribution("osmclient").version)) - except ClientException as e: - print(str(e)) - exit(1) - -@cli.command(name='upload-package', short_help='uploads a VNF package or NS package') + # try: + check_client_version(ctx.obj, "version") + print ("Server version: {}".format(ctx.obj.get_version())) + print ("Client version: {}".format(pkg_resources.get_distribution("osmclient").version)) + # except ClientException as e: + # print(str(e)) + # exit(1) + +@cli_osm.command(name='upload-package', short_help='uploads a VNF package or NS package') @click.argument('filename') @click.pass_context def upload_package(ctx, filename): @@ -3006,17 +3005,17 @@ def upload_package(ctx, filename): FILENAME: VNF or NS package file (tar.gz) """ - try: - ctx.obj.package.upload(filename) - fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__ - if fullclassname != 'osmclient.sol005.client.Client': - ctx.obj.package.wait_for_upload(filename) - except ClientException as e: - print(str(e)) - exit(1) + # try: + ctx.obj.package.upload(filename) + fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__ + if fullclassname != 'osmclient.sol005.client.Client': + ctx.obj.package.wait_for_upload(filename) + # except ClientException as e: + # print(str(e)) + # exit(1) -#@cli.command(name='ns-scaling-show') +#@cli_osm.command(name='ns-scaling-show') #@click.argument('ns_name') #@click.pass_context #def show_ns_scaling(ctx, ns_name): @@ -3058,7 +3057,7 @@ def upload_package(ctx, filename): # print(table) -#@cli.command(name='ns-scale') +#@cli_osm.command(name='ns-scale') #@click.argument('ns_name') #@click.option('--ns_scale_group', prompt=True) #@click.option('--index', prompt=True) @@ -3082,7 +3081,7 @@ def upload_package(ctx, filename): # exit(1) -#@cli.command(name='config-agent-list') +#@cli_osm.command(name='config-agent-list') #@click.pass_context #def config_agent_list(ctx): # """list config agents""" @@ -3101,7 +3100,7 @@ def upload_package(ctx, filename): # print(table) -#@cli.command(name='config-agent-delete') +#@cli_osm.command(name='config-agent-delete') #@click.argument('name') #@click.pass_context #def config_agent_delete(ctx, name): @@ -3117,7 +3116,7 @@ def upload_package(ctx, filename): # exit(1) -#@cli.command(name='config-agent-add') +#@cli_osm.command(name='config-agent-add') #@click.option('--name', # prompt=True) #@click.option('--account_type', @@ -3141,7 +3140,7 @@ def upload_package(ctx, filename): # exit(1) -#@cli.command(name='ro-dump') +#@cli_osm.command(name='ro-dump') #@click.pass_context #def ro_dump(ctx): # """shows RO agent information""" @@ -3154,7 +3153,7 @@ def upload_package(ctx, filename): # print(table) -#@cli.command(name='vcs-list') +#@cli_osm.command(name='vcs-list') #@click.pass_context #def vcs_list(ctx): # check_client_version(ctx.obj, ctx.command.name, 'v1') @@ -3166,7 +3165,7 @@ def upload_package(ctx, filename): # print(table) -@cli.command(name='ns-action', short_help='executes an action/primitive over a NS instance') +@cli_osm.command(name='ns-action', short_help='executes an action/primitive over a NS instance') @click.argument('ns_name') @click.option('--vnf_name', default=None, help='member-vnf-index if the target is a vnf instead of a ns)') @click.option('--kdu_name', default=None, help='kdu-name if the target is a kdu)') @@ -3195,33 +3194,33 @@ def ns_action(ctx, NS_NAME: name or ID of the NS instance """ - try: - check_client_version(ctx.obj, ctx.command.name) - op_data = {} - if vnf_name: - op_data['member_vnf_index'] = vnf_name - if kdu_name: - op_data['kdu_name'] = kdu_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 - if params_file: - with open(params_file, 'r') as pf: - params = pf.read() - if params: - op_data['primitive_params'] = yaml.safe_load(params) - else: - op_data['primitive_params'] = {} - print(ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data, wait=wait)) + # try: + check_client_version(ctx.obj, ctx.command.name) + op_data = {} + if vnf_name: + op_data['member_vnf_index'] = vnf_name + if kdu_name: + op_data['kdu_name'] = kdu_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 + if params_file: + with open(params_file, 'r') as pf: + params = pf.read() + if params: + op_data['primitive_params'] = yaml.safe_load(params) + else: + op_data['primitive_params'] = {} + print(ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data, wait=wait)) - except ClientException as e: - print(str(e)) - exit(1) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='vnf-scale', short_help='executes a VNF scale (adding/removing VDUs)') +@cli_osm.command(name='vnf-scale', short_help='executes a VNF scale (adding/removing VDUs)') @click.argument('ns_name') @click.argument('vnf_name') @click.option('--scaling-group', prompt=True, help="scaling-group-descriptor name to use") @@ -3241,21 +3240,21 @@ def vnf_scale(ctx, NS_NAME: name or ID of the NS instance. VNF_NAME: member-vnf-index in the NS to be scaled. """ - try: - check_client_version(ctx.obj, ctx.command.name) - if not scale_in and not scale_out: - scale_out = True - ctx.obj.ns.scale_vnf(ns_name, vnf_name, scaling_group, scale_in, scale_out) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + if not scale_in and not scale_out: + scale_out = True + ctx.obj.ns.scale_vnf(ns_name, vnf_name, scaling_group, scale_in, scale_out) + # except ClientException as e: + # print(str(e)) + # exit(1) ############################## # Role Management Operations # ############################## -@cli.command(name='role-create', short_help='creates a new role') +@cli_osm.command(name='role-create', short_help='creates a new role') @click.argument('name') @click.option('--permissions', default=None, @@ -3269,15 +3268,15 @@ def role_create(ctx, name, permissions): NAME: Name or ID of the role. DEFINITION: Definition of grant/denial of access to resources. """ - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.role.create(name, permissions) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.role.create(name, permissions) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='role-update', short_help='updates a role') +@cli_osm.command(name='role-update', short_help='updates a role') @click.argument('name') @click.option('--set-name', default=None, @@ -3302,15 +3301,15 @@ def role_update(ctx, name, set_name, add, remove): ADD: Grant/denial of access to resource to add. REMOVE: Grant/denial of access to resource to remove. """ - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.role.update(name, set_name, None, add, remove) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.role.update(name, set_name, None, add, remove) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='role-delete', short_help='deletes a role') +@cli_osm.command(name='role-delete', short_help='deletes a role') @click.argument('name') # @click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions') @click.pass_context @@ -3321,15 +3320,15 @@ def role_delete(ctx, name): \b NAME: Name or ID of the role. """ - try: - check_client_version(ctx.obj, ctx.command.name) - ctx.obj.role.delete(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + ctx.obj.role.delete(name) + # except ClientException as e: + # print(str(e)) + # exit(1) -@cli.command(name='role-list', short_help='list all roles') +@cli_osm.command(name='role-list', short_help='list all roles') @click.option('--filter', default=None, help='restricts the list to the projects matching the filter') @click.pass_context @@ -3337,12 +3336,12 @@ def role_list(ctx, filter): """ List all roles. """ - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.role.list(filter) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.role.list(filter) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['name', 'id']) for role in resp: table.add_row([role['name'], role['_id']]) @@ -3350,7 +3349,7 @@ def role_list(ctx, filter): print(table) -@cli.command(name='role-show', short_help='show specific role') +@cli_osm.command(name='role-show', short_help='show specific role') @click.argument('name') @click.pass_context def role_show(ctx, name): @@ -3360,12 +3359,12 @@ def role_show(ctx, name): \b NAME: Name or ID of the role. """ - try: - check_client_version(ctx.obj, ctx.command.name) - resp = ctx.obj.role.get(name) - except ClientException as e: - print(str(e)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + resp = ctx.obj.role.get(name) + # except ClientException as e: + # print(str(e)) + # exit(1) table = PrettyTable(['key', 'attribute']) for k, v in resp.items(): @@ -3374,7 +3373,7 @@ def role_show(ctx, name): print(table) -@cli.command(name='package-create', +@cli_osm.command(name='package-create', short_help='Create a package descriptor') @click.argument('package-type') @click.argument('package-name') @@ -3440,29 +3439,29 @@ def package_create(ctx, PACKAGE_NAME: Name of the package to create the folder with the content. """ - try: - check_client_version(ctx.obj, ctx.command.name) - print("Creating the {} structure: {}/{}".format(package_type.upper(), base_directory, package_name)) - resp = ctx.obj.package_tool.create(package_type, - base_directory, - package_name, - override=override, - image=image, - vdus=vdus, - vcpu=vcpu, - memory=memory, - storage=storage, - interfaces=interfaces, - vendor=vendor, - detailed=detailed, - netslice_subnets=netslice_subnets, - netslice_vlds=netslice_vlds) - print(resp) - except ClientException as inst: - print("ERROR: {}".format(inst)) - exit(1) - -@cli.command(name='package-validate', + # try: + check_client_version(ctx.obj, ctx.command.name) + print("Creating the {} structure: {}/{}".format(package_type.upper(), base_directory, package_name)) + resp = ctx.obj.package_tool.create(package_type, + base_directory, + package_name, + override=override, + image=image, + vdus=vdus, + vcpu=vcpu, + memory=memory, + storage=storage, + interfaces=interfaces, + vendor=vendor, + detailed=detailed, + netslice_subnets=netslice_subnets, + netslice_vlds=netslice_vlds) + print(resp) + # except ClientException as inst: + # print("ERROR: {}".format(inst)) + # exit(1) + +@cli_osm.command(name='package-validate', short_help='Validate a package descriptor') @click.argument('base-directory', default=".", @@ -3476,24 +3475,24 @@ def package_validate(ctx, \b BASE_DIRECTORY: Stub folder for NS, VNF or NST package. """ - try: - check_client_version(ctx.obj, ctx.command.name) - results = ctx.obj.package_tool.validate(base_directory) - table = PrettyTable() - table.field_names = ["TYPE", "PATH", "VALID", "ERROR"] - # Print the dictionary generated by the validation function - for result in results: - table.add_row([result["type"], result["path"], result["valid"], result["error"]]) - table.sortby = "VALID" - table.align["PATH"] = "l" - table.align["TYPE"] = "l" - table.align["ERROR"] = "l" - print(table) - except ClientException as inst: - print("ERROR: {}".format(inst)) - exit(1) + # try: + check_client_version(ctx.obj, ctx.command.name) + results = ctx.obj.package_tool.validate(base_directory) + table = PrettyTable() + table.field_names = ["TYPE", "PATH", "VALID", "ERROR"] + # Print the dictionary generated by the validation function + for result in results: + table.add_row([result["type"], result["path"], result["valid"], result["error"]]) + table.sortby = "VALID" + table.align["PATH"] = "l" + table.align["TYPE"] = "l" + table.align["ERROR"] = "l" + print(table) + # except ClientException as inst: + # print("ERROR: {}".format(inst)) + # exit(1) -@cli.command(name='package-build', +@cli_osm.command(name='package-build', short_help='Build the tar.gz of the package') @click.argument('package-folder') @click.option('--skip-validation', @@ -3510,20 +3509,28 @@ def package_build(ctx, \b PACKAGE_FOLDER: Folder of the NS, VNF or NST to be packaged """ + # try: + check_client_version(ctx.obj, ctx.command.name) + results = ctx.obj.package_tool.build(package_folder, skip_validation) + print(results) + # except ClientException as inst: + # print("ERROR: {}".format(inst)) + # exit(1) + + +def cli(): try: - check_client_version(ctx.obj, ctx.command.name) - results = ctx.obj.package_tool.build(package_folder, skip_validation) - print(results) - except ClientException as inst: - print("ERROR: {}".format(inst)) + cli_osm() + except pycurl.error as exc: + print(exc) + print('Maybe "--hostname" option or OSM_HOSTNAME environment variable needs to be specified') exit(1) + except ClientException as exc: + print("ERROR: {}".format(exc)) + exit(1) + # TODO capture other controlled exceptions here + # TODO remove the ClientException captures from all places, unless they do something different if __name__ == '__main__': - try: - cli() - except pycurl.error as e: - print(e) - print('Maybe "--hostname" option or OSM_HOSTNAME' + - 'environment variable needs to be specified') - exit(1) + cli() -- 2.25.1