projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow ns config to set vim network name
[osm/osmclient.git]
/
osmclient
/
scripts
/
osm.py
diff --git
a/osmclient/scripts/osm.py
b/osmclient/scripts/osm.py
index
23f6889
..
d0d78f5
100755
(executable)
--- 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('--ssh_keys',
default=None,
help='comma separated list of keys to inject to vnfs')
-@click.option('--
vim_network_prefix
',
+@click.option('--
config
',
default=None,
default=None,
- help='
vim network name prefix
')
+ help='
ns specific yaml configuration
')
@click.pass_context
def ns_create(ctx,
nsd_name,
@click.pass_context
def ns_create(ctx,
nsd_name,
@@
-217,12
+217,12
@@
def ns_create(ctx,
vim_account,
admin_status,
ssh_keys,
vim_account,
admin_status,
ssh_keys,
-
vim_network_prefix
):
+
config
):
try:
ctx.obj.ns.create(
nsd_name,
ns_name,
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:
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('--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')
@click.option('--config',
default=None,
help='VIM specific config parameters')
@@
-426,8
+422,6
@@
def vim_create(ctx,
password,
auth_url,
tenant,
password,
auth_url,
tenant,
- floating_ip_pool,
- keypair,
config,
account_type,
description):
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['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
vim['config'] = config
vim['vim-type'] = account_type
vim['description'] = description