X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;h=d0d78f52b65e4e5421f54fdc3bc6678b36ce07df;hb=6380fc0aa54cc7c3700a5a1f655e619471684611;hp=b7f5ac4a92b9edc8471451daa55e0447dac5f528;hpb=4c7e237e45bc6fe209006b4837a8e6b031e78e1c;p=osm%2Fosmclient.git

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index b7f5ac4..d0d78f5 100755
--- 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')
+@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',
@@ -47,7 +52,7 @@ import time
               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 " +
@@ -56,6 +61,7 @@ def cli(ctx, hostname, so_port, ro_hostname, ro_port):
     ctx.obj = client.Client(
         host=hostname,
         so_port=so_port,
+        so_project=so_project,
         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('--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,
@@ -211,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:
@@ -385,23 +391,28 @@ def config_agent_add(ctx, name, account_type, server, user, secret):
 
 @cli.command(name='vim-create')
 @click.option('--name',
-              prompt=True)
+              prompt=True,
+              help='Name to create datacenter')
 @click.option('--user',
-              prompt=True)
+              prompt=True,
+              help='VIM username')
 @click.option('--password',
               prompt=True,
               hide_input=True,
-              confirmation_prompt=True)
+              confirmation_prompt=True,
+              help='VIM password')
 @click.option('--auth_url',
-              prompt=True)
+              prompt=True,
+              help='VIM connector url')
 @click.option('--tenant',
-              prompt=True)
-@click.option('--floating_ip_pool',
-              default=None)
-@click.option('--keypair',
-              default=None)
+              prompt=True,
+              help='tenant name')
+@click.option('--config',
+              default=None,
+              help='VIM specific config parameters')
 @click.option('--account_type',
-              default='openstack')
+              default='openstack',
+              help='VIM type')
 @click.option('--description',
               default='no description')
 @click.pass_context
@@ -411,18 +422,16 @@ def vim_create(ctx,
                password,
                auth_url,
                tenant,
-               floating_ip_pool,
-               keypair,
+               config,
                account_type,
                description):
     vim = {}
-    vim['os-username'] = user
-    vim['os-password'] = password
-    vim['os-url'] = auth_url
-    vim['os-project-name'] = tenant
-    vim['floating_ip_pool'] = floating_ip_pool
-    vim['keypair'] = keypair
-    vim['vim-type'] = 'openstack'
+    vim['vim-username'] = user
+    vim['vim-password'] = password
+    vim['vim-url'] = auth_url
+    vim['vim-tenant-name'] = tenant
+    vim['config'] = config
+    vim['vim-type'] = account_type
     vim['description'] = description
     try:
         ctx.obj.vim.create(name, vim)
@@ -443,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']])