X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;h=46ceb91f2ef719637f99ab152665a300b6d680c3;hb=cc0db9ace36de244a1ce66b6694547a75239aa09;hp=a17340b622e587a4800d8d91becba21bb1ebf743;hpb=b763c85b898fad956e957514c82c15a95fb006e5;p=osm%2Fosmclient.git diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py index a17340b..46ceb91 100755 --- a/osmclient/scripts/osm.py +++ b/osmclient/scripts/osm.py @@ -228,6 +228,8 @@ def ns_list(ctx, filter, long): def summarize_deployment_status(status_dict): #Nets summary = "" + if not status_dict: + return summary n_nets = 0 status_nets = {} net_list = status_dict.get('nets',[]) @@ -278,6 +280,9 @@ def ns_list(ctx, filter, long): return summary def summarize_config_status(ee_list): + summary = "" + if not ee_list: + return summary n_ee = 0 status_ee = {} for ee in ee_list: @@ -290,7 +295,6 @@ def ns_list(ctx, filter, long): status_ee[ee['elementType']][ee['status']] += 1 else: status_ee[ee['elementType']][ee['status']] = 1 - summary = "" for elementType in ["KDU", "VDU", "PDU", "VNF", "NS"]: if elementType in status_ee: message = "" @@ -341,8 +345,8 @@ def ns_list(ctx, filter, long): date = datetime.fromtimestamp(nsr['create-time']).strftime("%Y-%m-%dT%H:%M:%S") ns_state = nsr.get('nsState', nsr['_admin']['nsState']) if long: - deployment_status = summarize_deployment_status(nsr['deploymentStatus']) - config_status = summarize_config_status(nsr['configurationStatus']) + deployment_status = summarize_deployment_status(nsr.get('deploymentStatus')) + config_status = summarize_config_status(nsr.get('configurationStatus')) project_id = nsr.get('_admin').get('projects_read')[0] project_name = '-' for p in project_list: @@ -1424,9 +1428,12 @@ def nsd_create(ctx, filename, overwrite, skip_charm_build): help='The charm will not be compiled, it is assumed to already exist') @click.pass_context def nsd_create1(ctx, filename, overwrite, skip_charm_build): - """creates a new NSD/NSpkg + """onboards a new NSpkg (alias of nspkg-create) (TO BE DEPRECATED) - FILENAME: NSD yaml file or NSpkg tar.gz file + \b + FILENAME: NF Package tar.gz file, NF Descriptor YAML file or NF Package folder + If FILENAME is a file (NF Package tar.gz or NF Descriptor YAML), it is onboarded. + If FILENAME is an NF Package folder, it is built and then onboarded. """ logger.debug("") nsd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build) @@ -1443,9 +1450,12 @@ def nsd_create1(ctx, filename, overwrite, skip_charm_build): help='The charm will not be compiled, it is assumed to already exist') @click.pass_context def nsd_create2(ctx, filename, overwrite, skip_charm_build): - """creates a new NSD/NSpkg + """onboards a new NSpkg - FILENAME: NSD folder, NSD yaml file or NSpkg tar.gz file + \b + FILENAME: NF Package tar.gz file, NF Descriptor YAML file or NF Package folder + If FILENAME is a file (NF Package tar.gz or NF Descriptor YAML), it is onboarded. + If FILENAME is an NF Package folder, it is built and then onboarded. """ logger.debug("") nsd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build) @@ -1480,9 +1490,12 @@ def vnfd_create(ctx, filename, overwrite, skip_charm_build, override_epa, overri help='overrides all VDU interfaces to PARAVIRT') @click.pass_context def vnfd_create1(ctx, filename, overwrite, skip_charm_build, override_epa, override_nonepa, override_paravirt): - """creates a new VNFD/VNFpkg + """onboards a new NFpkg (alias of nfpkg-create) (TO BE DEPRECATED) - FILENAME: VNFD yaml file or VNFpkg tar.gz file + \b + FILENAME: NF Package tar.gz file, NF Descriptor YAML file or NF Package folder + If FILENAME is a file (NF Package tar.gz or NF Descriptor YAML), it is onboarded. + If FILENAME is an NF Package folder, it is built and then onboarded. """ logger.debug("") vnfd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build, @@ -1506,9 +1519,12 @@ def vnfd_create1(ctx, filename, overwrite, skip_charm_build, override_epa, overr help='overrides all VDU interfaces to PARAVIRT') @click.pass_context def vnfd_create2(ctx, filename, overwrite, skip_charm_build, override_epa, override_nonepa, override_paravirt): - """creates a new VNFD/VNFpkg + """onboards a new NFpkg (alias of nfpkg-create) - FILENAME: NF Package Folder, NF Descriptor yaml file or NFpkg tar.gz file + \b + FILENAME: NF Package tar.gz file, NF Descriptor YAML file or NF Package folder + If FILENAME is a file (NF Package tar.gz or NF Descriptor YAML), it is onboarded. + If FILENAME is an NF Package folder, it is built and then onboarded. """ logger.debug("") vnfd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build, @@ -1532,9 +1548,12 @@ def vnfd_create2(ctx, filename, overwrite, skip_charm_build, override_epa, overr help='overrides all VDU interfaces to PARAVIRT') @click.pass_context def nfpkg_create(ctx, filename, overwrite, skip_charm_build, override_epa, override_nonepa, override_paravirt): - """creates a new NFpkg + """onboards a new NFpkg (alias of nfpkg-create) - FILENAME: NF Package Folder, NF Descriptor yaml file or NFpkg tar.gz filems to build + \b + FILENAME: NF Package tar.gz file, NF Descriptor YAML file or NF Package folder + If FILENAME is a file (NF Package tar.gz or NF Descriptor YAML), it is onboarded. + If FILENAME is an NF Package folder, it is built and then onboarded. """ logger.debug("") vnfd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build, @@ -1615,13 +1634,13 @@ def nst_create(ctx, filename, overwrite): help='overrides fields in descriptor, format: ' '"key1.key2...=value[;key3...=value;...]"') @click.pass_context -def nst_create1(ctx, charm_folder, overwrite): +def nst_create1(ctx, filename, overwrite): """creates a new Network Slice Template (NST) FILENAME: NST package folder, NST yaml file or NSTpkg tar.gz file """ logger.debug("") - nst_create(ctx, charm_folder, overwrite) + nst_create(ctx, filename, overwrite) @cli_osm.command(name='netslice-template-create', short_help='creates a new Network Slice Template (NST)')