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
dee931f
..
d0d78f5
100755
(executable)
--- a/
osmclient/scripts/osm.py
+++ b/
osmclient/scripts/osm.py
@@
-36,6
+36,11
@@
import time
envvar='OSM_SO_PORT',
help='hostname of server. ' +
'Also can set OSM_SO_PORT in environment')
envvar='OSM_SO_PORT',
help='hostname of server. ' +
'Also can set OSM_SO_PORT in environment')
+@click.option('--so-project',
+ default='default',
+ envvar='OSM_SO_PROJECT',
+ help='Project Name in SO. ' +
+ 'Also can set OSM_SO_PROJECT in environment')
@click.option('--ro-hostname',
default=None,
envvar='OSM_RO_HOSTNAME',
@click.option('--ro-hostname',
default=None,
envvar='OSM_RO_HOSTNAME',
@@
-47,7
+52,7
@@
import time
help='hostname of RO server. ' +
'Also can set OSM_RO_PORT in environment')
@click.pass_context
help='hostname of RO server. ' +
'Also can set OSM_RO_PORT in environment')
@click.pass_context
-def cli(ctx, hostname, so_port, ro_hostname, ro_port):
+def cli(ctx, hostname, so_port,
so_project,
ro_hostname, ro_port):
if hostname is None:
print(
"either hostname option or OSM_HOSTNAME " +
if hostname is None:
print(
"either hostname option or OSM_HOSTNAME " +
@@
-56,6
+61,7
@@
def cli(ctx, hostname, so_port, ro_hostname, ro_port):
ctx.obj = client.Client(
host=hostname,
so_port=so_port,
ctx.obj = client.Client(
host=hostname,
so_port=so_port,
+ so_project=so_project,
ro_host=ro_hostname,
ro_port=ro_port)
ro_host=ro_hostname,
ro_port=ro_port)
@@
-201,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,
@@
-211,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:
@@
-401,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')
@@
-420,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):
@@
-430,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
@@
-454,9
+452,12
@@
def vim_delete(ctx, name):
@cli.command(name='vim-list')
@cli.command(name='vim-list')
+@click.option('--ro_update/--no_ro_update',
+ default=False,
+ help='update list from RO')
@click.pass_context
@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']])
table = PrettyTable(['vim name', 'uuid'])
for vim in resp:
table.add_row([vim['name'], vim['uuid']])