X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;h=23b1ee44c8cd6dc0787fcff01cc30f90dbe6a5a5;hb=refs%2Fchanges%2F94%2F8794%2F3;hp=e1dbb8e54f82c576fa4851be20269dde00e68e9d;hpb=5d41362313f63d22266adb647a79a43eb993e8eb;p=osm%2Fosmclient.git diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py index e1dbb8e..23b1ee4 100755 --- a/osmclient/scripts/osm.py +++ b/osmclient/scripts/osm.py @@ -230,7 +230,7 @@ def ns_list(ctx, filter, long): summary = "" n_nets = 0 status_nets = {} - net_list = status_dict['nets'] + net_list = status_dict.get('nets',[]) for net in net_list: n_nets += 1 if net['status'] not in status_nets: @@ -1446,11 +1446,13 @@ def nsd_create2(ctx, filename, overwrite, skip_charm_build): nsd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build) -def vnfd_create(ctx, filename, overwrite, skip_charm_build): +def vnfd_create(ctx, filename, overwrite, skip_charm_build, override_epa, override_nonepa, override_paravirt): logger.debug("") # try: check_client_version(ctx.obj, ctx.command.name) - ctx.obj.vnfd.create(filename, overwrite=overwrite, skip_charm_build=skip_charm_build) + ctx.obj.vnfd.create(filename, overwrite=overwrite, skip_charm_build=skip_charm_build, + override_epa=override_epa, override_nonepa=override_nonepa, + override_paravirt=override_paravirt) # except ClientException as e: # print(str(e)) # exit(1) @@ -1465,14 +1467,21 @@ def vnfd_create(ctx, filename, overwrite, skip_charm_build): '"key1.key2...=value[;key3...=value;...]"') @click.option('--skip-charm-build', default=False, is_flag=True, help='The charm will not be compiled, it is assumed to already exist') -@click.pass_context -def vnfd_create1(ctx, filename, overwrite, skip_charm_build): +@click.option('--override-epa', required=False, default=False, is_flag=True, + help='adds guest-epa parameters to all VDU') +@click.option('--override-nonepa', required=False, default=False, is_flag=True, + help='removes all guest-epa parameters from all VDU') +@click.option('--override-paravirt', required=False, default=False, is_flag=True, + 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 FILENAME: VNFD yaml file or VNFpkg tar.gz file """ logger.debug("") - vnfd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build) + vnfd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build, + override_epa=override_epa, override_nonepa=override_nonepa, override_paravirt=override_paravirt) @cli_osm.command(name='vnfpkg-create', short_help='creates a new VNFD/VNFpkg') @@ -1484,14 +1493,21 @@ def vnfd_create1(ctx, filename, overwrite, skip_charm_build): '"key1.key2...=value[;key3...=value;...]"') @click.option('--skip-charm-build', default=False, is_flag=True, help='The charm will not be compiled, it is assumed to already exist') -@click.pass_context -def vnfd_create2(ctx, filename, overwrite, skip_charm_build): +@click.option('--override-epa', required=False, default=False, is_flag=True, + help='adds guest-epa parameters to all VDU') +@click.option('--override-nonepa', required=False, default=False, is_flag=True, + help='removes all guest-epa parameters from all VDU') +@click.option('--override-paravirt', required=False, default=False, is_flag=True, + 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 FILENAME: NF Package Folder, NF Descriptor yaml file or NFpkg tar.gz file """ logger.debug("") - vnfd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build) + vnfd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build, + override_epa=override_epa, override_nonepa=override_nonepa, override_paravirt=override_paravirt) @cli_osm.command(name='nfpkg-create', short_help='creates a new NFpkg') @@ -1503,14 +1519,21 @@ def vnfd_create2(ctx, filename, overwrite, skip_charm_build): '"key1.key2...=value[;key3...=value;...]"') @click.option('--skip-charm-build', default=False, is_flag=True, help='The charm will not be compiled, it is assumed to already exist') -@click.pass_context -def nfpkg_create(ctx, filename, overwrite, skip_charm_build): +@click.option('--override-epa', required=False, default=False, is_flag=True, + help='adds guest-epa parameters to all VDU') +@click.option('--override-nonepa', required=False, default=False, is_flag=True, + help='removes all guest-epa parameters from all VDU') +@click.option('--override-paravirt', required=False, default=False, is_flag=True, + 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 FILENAME: NF Package Folder, NF Descriptor yaml file or NFpkg tar.gz filems to build """ logger.debug("") - vnfd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build) + vnfd_create(ctx, filename, overwrite=overwrite, skip_charm_build=skip_charm_build, + override_epa=override_epa, override_nonepa=override_nonepa, override_paravirt=override_paravirt) @cli_osm.command(name='ns-create', short_help='creates a new Network Service instance') @@ -2718,7 +2741,8 @@ def k8scluster_add(ctx, cluster['k8s_version'] = version cluster['vim_account'] = vim cluster['nets'] = yaml.safe_load(k8s_nets) - cluster['description'] = description + if description: + cluster['description'] = description if namespace: cluster['namespace'] = namespace if cni: cluster['cni'] = yaml.safe_load(cni) ctx.obj.k8scluster.create(name, cluster) @@ -2877,7 +2901,8 @@ def repo_add(ctx, repo['name'] = name repo['url'] = uri repo['type'] = type - repo['description'] = description + if description: + repo['description'] = description ctx.obj.repo.create(name, repo) # except ClientException as e: # print(str(e)) @@ -3580,6 +3605,7 @@ def upload_package(ctx, filename, skip_charm_build): @click.option('--action_name', prompt=True, help='action name') @click.option('--params', default=None, help='action params in YAML/JSON inline string') @click.option('--params_file', default=None, help='YAML/JSON file with action params') +@click.option('--timeout', required=False, default=None, type=int, help='timeout in seconds') @click.option('--wait', required=False, default=False, @@ -3595,6 +3621,7 @@ def ns_action(ctx, action_name, params, params_file, + timeout, wait): """executes an action/primitive over a NS instance @@ -3612,6 +3639,8 @@ def ns_action(ctx, op_data['vdu_id'] = vdu_id if vdu_count: op_data['vdu_count_index'] = vdu_count + if timeout: + op_data['timeout_ns_action'] = timeout op_data['primitive'] = action_name if params_file: with open(params_file, 'r') as pf: @@ -3633,13 +3662,18 @@ def ns_action(ctx, @click.option('--scaling-group', prompt=True, help="scaling-group-descriptor name to use") @click.option('--scale-in', default=False, is_flag=True, help="performs a scale in operation") @click.option('--scale-out', default=False, is_flag=True, help="performs a scale out operation (by default)") +@click.option('--timeout', required=False, default=None, type=int, help='timeout in seconds') +@click.option('--wait', required=False, default=False, is_flag=True, + help='do not return the control immediately, but keep it until the operation is completed, or timeout') @click.pass_context def vnf_scale(ctx, ns_name, vnf_name, scaling_group, scale_in, - scale_out): + scale_out, + timeout, + wait): """ Executes a VNF scale (adding/removing VDUs) @@ -3652,7 +3686,7 @@ def vnf_scale(ctx, 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) + ctx.obj.ns.scale_vnf(ns_name, vnf_name, scaling_group, scale_in, scale_out, wait, timeout) # except ClientException as e: # print(str(e)) # exit(1)