X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;h=c434fe85f94035ef464b9582de1b8907a21fa2a3;hb=631949fc005ba91d4af5127821f59fa7c5c9d0be;hp=d71eaaae432e07d4f2aa902fc7db2af86ed57690;hpb=db09ff0a44484d0d16769130e817dc24010c4070;p=osm%2Fosmclient.git diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py index d71eaaa..c434fe8 100755 --- a/osmclient/scripts/osm.py +++ b/osmclient/scripts/osm.py @@ -33,10 +33,6 @@ import logging from datetime import datetime -# Global variables - -CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'], max_content_width=160) - def wrap_text(text, width): wrapper = textwrap.TextWrapper(width=width) lines = text.splitlines() @@ -69,6 +65,30 @@ def check_client_version(obj, what, version='sol005'): return +def get_project(project_list, item): + # project_list = ctx.obj.project.list() + item_project_list = item.get('_admin', {}).get('projects_read') + project_id = 'None' + project_name = 'None' + if item_project_list: + for p1 in item_project_list: + project_id = p1 + for p2 in project_list: + if p2['_id'] == project_id: + project_name = p2['name'] + return project_id, project_name + return project_id, project_name + + +def get_vim_name(vim_list, vim_id): + vim_name = '-' + for v in vim_list: + if v['uuid'] == vim_id: + vim_name = v['name'] + break + return vim_name + + @click.group(context_settings=dict(help_option_names=['-h', '--help'], max_content_width=160)) @click.option('--hostname', default="127.0.0.1", @@ -327,7 +347,10 @@ def ns_list(ctx, filter, long): 'deployment status', 'configuration status']) project_list = ctx.obj.project.list() - vim_list = ctx.obj.vim.list() + try: + vim_list = ctx.obj.vim.list() + except: + vim_list = [] else: table = PrettyTable( ['ns instance name', @@ -348,20 +371,12 @@ def ns_list(ctx, filter, long): if long: 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: - if p['_id'] == project_id: - project_name = p['name'] - break + project_id, project_name = get_project(project_list, nsr) #project = '{} ({})'.format(project_name, project_id) project = project_name vim_id = nsr.get('datacenter') - vim_name = '-' - for v in vim_list: - if v['uuid'] == vim_id: - vim_name = v['name'] - break + vim_name = get_vim_name(vim_list, vim_id) + #vim = '{} ({})'.format(vim_name, vim_id) vim = vim_name if 'currentOperation' in nsr: @@ -429,7 +444,7 @@ def nsd_list(ctx, filter, long): else: table = PrettyTable(['nsd name', 'id']) for nsd in resp: - name = nsd.get('name','-') + name = nsd.get('id', '-') if long: onb_state = nsd['_admin'].get('onboardingState','-') op_state = nsd['_admin'].get('operationalState','-') @@ -470,18 +485,16 @@ def nsd_list2(ctx, filter, long): def pkg_repo_list(ctx, pkgtype, filter, repo, long): - if filter: - filter='&'.join(filter) resp = ctx.obj.osmrepo.pkg_list(pkgtype, filter, repo) if long: table = PrettyTable(['nfpkg name', 'vendor', 'version', 'latest', 'description', 'repository']) else: table = PrettyTable(['nfpkg name', 'repository']) for vnfd in resp: - name = vnfd.get('name', '-') + name = vnfd.get('id', vnfd.get('name','-')) repository = vnfd.get('repository') if long: - vendor = vnfd.get('vendor') + vendor = vnfd.get('provider', vnfd.get('vendor')) version = vnfd.get('version') description = vnfd.get('description') latest = vnfd.get('latest') @@ -520,23 +533,24 @@ def vnfd_list(ctx, nf_type, filter, long): fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__ if fullclassname == 'osmclient.sol005.client.Client': if long: - table = PrettyTable(['nfpkg name', 'id', 'vendor', 'version', 'onboarding state', 'operational state', + table = PrettyTable(['nfpkg name', 'id', 'desc type', 'vendor', 'version', 'onboarding state', 'operational state', 'usage state', 'date', 'last update']) else: - table = PrettyTable(['nfpkg name', 'id']) + table = PrettyTable(['nfpkg name', 'id', 'desc type']) for vnfd in resp: - name = vnfd['name'] if 'name' in vnfd else '-' + name = vnfd.get('id', vnfd.get('name','-')) + descriptor_type = 'sol006' if 'product-name' in vnfd else 'rel8' if long: onb_state = vnfd['_admin'].get('onboardingState','-') op_state = vnfd['_admin'].get('operationalState','-') - vendor = vnfd.get('vendor') + vendor = vnfd.get('provider', vnfd.get('vendor')) version = vnfd.get('version') usage_state = vnfd['_admin'].get('usageState','-') date = datetime.fromtimestamp(vnfd['_admin']['created']).strftime("%Y-%m-%dT%H:%M:%S") last_update = datetime.fromtimestamp(vnfd['_admin']['modified']).strftime("%Y-%m-%dT%H:%M:%S") - table.add_row([name, vnfd['_id'], vendor, version, onb_state, op_state, usage_state, date, last_update]) + table.add_row([name, vnfd['_id'], descriptor_type, vendor, version, onb_state, op_state, usage_state, date, last_update]) else: - table.add_row([name, vnfd['_id']]) + table.add_row([name, vnfd['_id'], descriptor_type]) else: table = PrettyTable(['nfpkg name', 'id']) for vnfd in resp: @@ -568,6 +582,7 @@ def vnfd_list2(ctx, nf_type, filter, long): logger.debug("") vnfd_list(ctx, nf_type, filter, long) + @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, multiple=True, @@ -584,6 +599,7 @@ def nfpkg_list(ctx, nf_type, filter, long): # print(str(e)) # exit(1) + @cli_osm.command(name='vnfpkg-repo-list', short_help='list all xNF from OSM repositories') @click.option('--filter', default=None, multiple=True, help='restricts the list to the NFpkg matching the filter') @@ -608,6 +624,7 @@ def nfpkg_repo_list2(ctx, filter, repo, long): pkgtype = 'vnf' pkg_repo_list(ctx, pkgtype, filter, repo, long) + def vnf_list(ctx, ns, filter, long): # try: if ns or filter: @@ -1116,7 +1133,6 @@ def vnfd_show2(ctx, name, literal): logger.debug("") vnfd_show(ctx, name, literal) - @cli_osm.command(name='vnfpkg-repo-show', short_help='shows the details of a NF package in an OSM repository') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @@ -1160,7 +1176,6 @@ def nsd_repo_show(ctx, name, repo, version, literal=None, filter=None): pkgtype = 'ns' pkg_repo_show(ctx, pkgtype, name, repo, version, filter, literal) - @cli_osm.command(name='nspkg-repo-show', short_help='shows the details of a NS package in an OSM repository') @click.option('--literal', is_flag=True, help='print literally, no pretty table') @@ -1334,7 +1349,6 @@ def vnf_show(ctx, name, literal, filter, kdu): return table = PrettyTable(['field', 'value']) - for k, v in list(resp.items()): if not filter or k in filter: table.add_row([k, wrap_text(text=json.dumps(v,indent=2),width=100)]) @@ -2565,29 +2579,22 @@ def vim_list(ctx, filter, long): # resp = ctx.obj.vim.list(ro_update) if long: table = PrettyTable(['vim name', 'uuid', 'project', 'operational state', 'error details']) + project_list = ctx.obj.project.list() else: table = PrettyTable(['vim name', 'uuid', 'operational state']) for vim in resp: if long: - vim_details = ctx.obj.vim.get(vim['uuid']) - if 'vim_password' in vim_details: - vim_details['vim_password']='********' - logger.debug('VIM details: {}'.format(yaml.safe_dump(vim_details))) - vim_state = vim_details['_admin'].get('operationalState', '-') + if 'vim_password' in vim: + vim['vim_password']='********' + logger.debug('VIM details: {}'.format(yaml.safe_dump(vim))) + vim_state = vim['_admin'].get('operationalState', '-') error_details = 'N/A' if vim_state == 'ERROR': - error_details = vim_details['_admin'].get('detailed-status', 'Not found') - project_list = ctx.obj.project.list() - vim_project_list = vim_details.get('_admin').get('projects_read') - project_id = 'None' - project_name = 'None' - if vim_project_list: - project_id = vim_project_list[0] - for p in project_list: - if p['_id'] == project_id: - project_name = p['name'] - break - table.add_row([vim['name'], vim['uuid'], '{} ({})'.format(project_name, project_id), + error_details = vim['_admin'].get('detailed-status', 'Not found') + project_id, project_name = get_project(project_list, vim) + #project_info = '{} ({})'.format(project_name, project_id) + project_info = project_name + table.add_row([vim['name'], vim['uuid'], project_info, vim_state, wrap_text(text=error_details, width=80)]) else: table.add_row([vim['name'], vim['uuid'], vim['_admin'].get('operationalState', '-')]) @@ -3121,8 +3128,9 @@ def k8scluster_delete(ctx, name, force): help='restricts the list to the K8s clusters matching the filter') @click.option('--literal', is_flag=True, help='print literally, no pretty table') +@click.option('--long', is_flag=True, help='get more details') @click.pass_context -def k8scluster_list(ctx, filter, literal): +def k8scluster_list(ctx, filter, literal, long): """list all K8s clusters""" # try: check_client_version(ctx.obj, ctx.command.name) @@ -3132,11 +3140,37 @@ def k8scluster_list(ctx, filter, literal): if literal: print(yaml.safe_dump(resp, indent=4, default_flow_style=False)) return - table = PrettyTable(['Name', 'Id', 'Version', 'VIM', 'K8s-nets', 'Operational State', 'Description']) + if long: + table = PrettyTable(['Name', 'Id', 'Project', 'Version', 'VIM', 'K8s-nets', + 'Operational State', 'Op. state (details)', 'Description', 'Detailed status']) + project_list = ctx.obj.project.list() + else: + table = PrettyTable(['Name', 'Id', 'VIM', 'Operational State', 'Op. state details']) + try: + vim_list = ctx.obj.vim.list() + except: + vim_list = [] 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') or '', 40)]) + logger.debug('Cluster details: {}'.format(yaml.safe_dump(cluster))) + vim_name = get_vim_name(vim_list, cluster['vim_account']) + #vim_info = '{} ({})'.format(vim_name,cluster['vim_account']) + vim_info = vim_name + op_state_details = "Helm: {}\nJuju: {}".format( + cluster["_admin"].get("helm-chart", {}).get("operationalState", "-"), + cluster["_admin"].get("juju-bundle", {}).get("operationalState", "-")) + if long: + project_id, project_name = get_project(project_list, cluster) + #project_info = '{} ({})'.format(project_name, project_id) + project_info = project_name + detailed_status = cluster["_admin"].get("detailed-status","-") + table.add_row([cluster['name'], cluster['_id'], project_info, + cluster['k8s_version'], vim_info, + json.dumps(cluster['nets']), cluster["_admin"]["operationalState"], + op_state_details, trunc_text(cluster.get('description') or '', 40), + wrap_text(text=detailed_status, width=40)]) + else: + table.add_row([cluster['name'], cluster['_id'], vim_info, + cluster["_admin"]["operationalState"], op_state_details]) table.align = 'l' print(table) # except ClientException as e: @@ -4186,7 +4220,7 @@ def role_show(ctx, name): @cli_osm.command(name='package-create', - short_help='Create a package descriptor') + short_help='Create empty NS package structure') @click.argument('package-type') @click.argument('package-name') @click.option('--base-directory', @@ -4252,6 +4286,7 @@ def package_create(ctx, """ # try: + logger.debug("") 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, @@ -4274,7 +4309,7 @@ def package_create(ctx, # exit(1) @cli_osm.command(name='package-validate', - short_help='Validate a package descriptor') + short_help='Validate descriptors given a base directory') @click.argument('base-directory', default=".", required=False) @@ -4282,19 +4317,25 @@ def package_create(ctx, default=True, help='The activated recursive option will validate the yaml files' ' within the indicated directory and in its subdirectories') +@click.option('--old', + is_flag=True, + default=False, + help='Validates also the descriptors using the previous OSM format (pre SOL006)') @click.pass_context def package_validate(ctx, base_directory, - recursive): + recursive, + old): """ Validate descriptors given a base directory. \b - BASE_DIRECTORY: Stub folder for NS, VNF or NST package. + BASE_DIRECTORY: Base folder for NS, VNF or NST package. """ # try: + logger.debug("") check_client_version(ctx.obj, ctx.command.name) - results = ctx.obj.package_tool.validate(base_directory, recursive) + results = ctx.obj.package_tool.validate(base_directory, recursive, old) table = PrettyTable() table.field_names = ["TYPE", "PATH", "VALID", "ERROR"] # Print the dictionary generated by the validation function @@ -4309,6 +4350,47 @@ def package_validate(ctx, # print("ERROR: {}".format(inst)) # exit(1) +@cli_osm.command(name='package-translate', + short_help='Translate descriptors given a base directory') +@click.argument('base-directory', + default=".", + required=False) +@click.option('--recursive/--no-recursive', + default=True, + help='The activated recursive option will translate the yaml files' + ' within the indicated directory and in its subdirectories') +@click.option('--dryrun', + is_flag=True, + default=False, + help='Do not translate yet, only make a dry-run to test translation') +@click.pass_context +def package_translate(ctx, + base_directory, + recursive, + dryrun): + """ + Translate descriptors given a base directory. + + \b + BASE_DIRECTORY: Stub folder for NS, VNF or NST package. + """ + logger.debug("") + check_client_version(ctx.obj, ctx.command.name) + results = ctx.obj.package_tool.translate(base_directory, recursive, dryrun) + table = PrettyTable() + table.field_names = ["CURRENT TYPE", "NEW TYPE", "PATH", "VALID", "TRANSLATED", "ERROR"] + # Print the dictionary generated by the validation function + for result in results: + table.add_row([result["current type"], result["new type"], result["path"], result["valid"], result["translated"], result["error"]]) + table.sortby = "TRANSLATED" + 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_osm.command(name='package-build', short_help='Build the tar.gz of the package') @click.argument('package-folder') @@ -4330,6 +4412,7 @@ def package_build(ctx, PACKAGE_FOLDER: Folder of the NS, VNF or NST to be packaged """ # try: + logger.debug("") check_client_version(ctx.obj, ctx.command.name) results = ctx.obj.package_tool.build(package_folder, skip_validation=skip_validation, @@ -4339,6 +4422,24 @@ def package_build(ctx, # print("ERROR: {}".format(inst)) # exit(1) +@cli_osm.command(name='descriptor-translate', + short_help='Translate input descriptor file from Rel EIGHT OSM descriptors to SOL006 and prints in standard output') +@click.argument('descriptor-file', + required=True) +@click.pass_context +def descriptor_translate(ctx, + descriptor_file): + """ + Translate input descriptor. + + \b + DESCRIPTOR_FILE: Descriptor file for NS, VNF or Network Slice. + """ + logger.debug("") + check_client_version(ctx.obj, ctx.command.name) + result = ctx.obj.package_tool.descriptor_translate(descriptor_file) + print(result) + def cli(): try: