projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move wim_account parameter inside config of ns-create
[osm/osmclient.git]
/
osmclient
/
scripts
/
osm.py
diff --git
a/osmclient/scripts/osm.py
b/osmclient/scripts/osm.py
index
0a4c465
..
3a06077
100755
(executable)
--- a/
osmclient/scripts/osm.py
+++ b/
osmclient/scripts/osm.py
@@
-270,7
+270,7
@@
def vnfd_list(ctx, nf_type, filter):
else:
resp = ctx.obj.vnfd.list()
#print yaml.safe_dump(resp)
else:
resp = ctx.obj.vnfd.list()
#print yaml.safe_dump(resp)
- table = PrettyTable(['
vnfd
name', 'id'])
+ table = PrettyTable(['
nfpkg
name', 'id'])
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
for vnfd in resp:
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
for vnfd in resp:
@@
-1158,7
+1158,7
@@
def ns_create(ctx,
ssh_keys=ssh_keys,
account=vim_account)
except ClientException as inst:
ssh_keys=ssh_keys,
account=vim_account)
except ClientException as inst:
- print(
(inst.message)
)
+ print(
inst.message
)
exit(1)
exit(1)
@@
-2236,7
+2236,9
@@
def project_show(ctx, name):
confirmation_prompt=True,
help='user password')
@click.option('--projects',
confirmation_prompt=True,
help='user password')
@click.option('--projects',
- default=None,
+ prompt="Comma separate list of projects",
+ multiple=True,
+ callback=lambda ctx, param, value: ''.join(value).split(',') if all(len(x)==1 for x in value) else value,
help='list of project ids that the user belongs to')
#@click.option('--description',
# default='no description',
help='list of project ids that the user belongs to')
#@click.option('--description',
# default='no description',
@@
-2289,7
+2291,7
@@
def user_list(ctx, filter):
exit(1)
table = PrettyTable(['name', 'id'])
for user in resp:
exit(1)
table = PrettyTable(['name', 'id'])
for user in resp:
- table.add_row([user['name'], user['_id']])
+ table.add_row([user['
user
name'], user['_id']])
table.align = 'l'
print(table)
table.align = 'l'
print(table)