projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RBAC Support for OSMCLIENT
[osm/osmclient.git]
/
osmclient
/
scripts
/
osm.py
diff --git
a/osmclient/scripts/osm.py
b/osmclient/scripts/osm.py
index
b7f5ac4
..
5d8b2b3
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)
@@
-385,23
+391,32
@@
def config_agent_add(ctx, name, account_type, server, user, secret):
@cli.command(name='vim-create')
@click.option('--name',
@cli.command(name='vim-create')
@click.option('--name',
- prompt=True)
+ prompt=True,
+ help='Name to create datacenter')
@click.option('--user',
@click.option('--user',
- prompt=True)
+ prompt=True,
+ help='VIM username')
@click.option('--password',
prompt=True,
hide_input=True,
@click.option('--password',
prompt=True,
hide_input=True,
- confirmation_prompt=True)
+ confirmation_prompt=True,
+ help='VIM password')
@click.option('--auth_url',
@click.option('--auth_url',
- prompt=True)
+ prompt=True,
+ help='VIM connector url')
@click.option('--tenant',
@click.option('--tenant',
- prompt=True)
+ prompt=True,
+ help='tenant name')
@click.option('--floating_ip_pool',
default=None)
@click.option('--keypair',
default=None)
@click.option('--floating_ip_pool',
default=None)
@click.option('--keypair',
default=None)
+@click.option('--config',
+ default=None,
+ help='VIM specific config parameters')
@click.option('--account_type',
@click.option('--account_type',
- default='openstack')
+ default='openstack',
+ help='VIM type')
@click.option('--description',
default='no description')
@click.pass_context
@click.option('--description',
default='no description')
@click.pass_context
@@
-413,16
+428,18
@@
def vim_create(ctx,
tenant,
floating_ip_pool,
keypair,
tenant,
floating_ip_pool,
keypair,
+ config,
account_type,
description):
vim = {}
account_type,
description):
vim = {}
- vim['
os
-username'] = user
- vim['
os
-password'] = password
- vim['
os
-url'] = auth_url
- vim['
os-projec
t-name'] = tenant
+ vim['
vim
-username'] = user
+ vim['
vim
-password'] = password
+ vim['
vim
-url'] = auth_url
+ vim['
vim-tenan
t-name'] = tenant
vim['floating_ip_pool'] = floating_ip_pool
vim['keypair'] = keypair
vim['floating_ip_pool'] = floating_ip_pool
vim['keypair'] = keypair
- vim['vim-type'] = 'openstack'
+ vim['config'] = config
+ vim['vim-type'] = account_type
vim['description'] = description
try:
ctx.obj.vim.create(name, vim)
vim['description'] = description
try:
ctx.obj.vim.create(name, vim)