X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;h=d0d78f52b65e4e5421f54fdc3bc6678b36ce07df;hb=6380fc0aa54cc7c3700a5a1f655e619471684611;hp=5d8b2b366472e18be05adab7bb846d033a041228;hpb=c009e0adcaaa63f0a998f47020472679fd295d38;p=osm%2Fosmclient.git diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py index 5d8b2b3..d0d78f5 100755 --- a/osmclient/scripts/osm.py +++ b/osmclient/scripts/osm.py @@ -207,9 +207,9 @@ def ns_monitoring_show(ctx, ns_name): @click.option('--ssh_keys', default=None, help='comma separated list of keys to inject to vnfs') -@click.option('--vim_network_prefix', +@click.option('--config', default=None, - help='vim network name prefix') + help='ns specific yaml configuration') @click.pass_context def ns_create(ctx, nsd_name, @@ -217,12 +217,12 @@ def ns_create(ctx, vim_account, admin_status, ssh_keys, - vim_network_prefix): + config): try: ctx.obj.ns.create( nsd_name, ns_name, - vim_network_prefix=vim_network_prefix, + config=config, ssh_keys=ssh_keys, account=vim_account) except ClientException as inst: @@ -407,10 +407,6 @@ def config_agent_add(ctx, name, account_type, server, user, secret): @click.option('--tenant', prompt=True, help='tenant name') -@click.option('--floating_ip_pool', - default=None) -@click.option('--keypair', - default=None) @click.option('--config', default=None, help='VIM specific config parameters') @@ -426,8 +422,6 @@ def vim_create(ctx, password, auth_url, tenant, - floating_ip_pool, - keypair, config, account_type, description): @@ -436,8 +430,6 @@ def vim_create(ctx, vim['vim-password'] = password vim['vim-url'] = auth_url vim['vim-tenant-name'] = tenant - vim['floating_ip_pool'] = floating_ip_pool - vim['keypair'] = keypair vim['config'] = config vim['vim-type'] = account_type vim['description'] = description @@ -460,9 +452,12 @@ def vim_delete(ctx, name): @cli.command(name='vim-list') +@click.option('--ro_update/--no_ro_update', + default=False, + help='update list from RO') @click.pass_context -def vim_list(ctx): - resp = ctx.obj.vim.list() +def vim_list(ctx, ro_update): + resp = ctx.obj.vim.list(ro_update) table = PrettyTable(['vim name', 'uuid']) for vim in resp: table.add_row([vim['name'], vim['uuid']])