--sol005 as default option

[osm/osmclient.git] / osmclient / scripts / osm.py

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index 78dd232..d581228 100755 (executable)
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -69,10 +69,10 @@ def check_client_version(obj, what, version='sol005'):
               envvar='OSM_RO_PORT',
               help='hostname of RO server.  ' +
                    'Also can set OSM_RO_PORT in environment')
-@click.option('--sol005',
-              is_flag=True,
+@click.option('--sol005/--no-sol005',
+              default=True,
               envvar='OSM_SOL005',
-              help='Use ETSI NFV SOL005 API')
+              help='Use ETSI NFV SOL005 API (default) or the previous SO API')
 @click.pass_context
 def cli(ctx, hostname, so_port, so_project, ro_hostname, ro_port, sol005):
     if hostname is None:
@@ -238,6 +238,7 @@ def vnf_list(ctx, ns):
              'ns id',
              'vnf member index',
              'vnfd name',
+             'vim account id',
              'ip address'])
         for vnfr in resp:
             name = vnfr['name'] if 'name' in vnfr else '-'
@@ -247,6 +248,7 @@ def vnf_list(ctx, ns):
                  vnfr['nsr-id-ref'],
                  vnfr['member-vnf-index-ref'],
                  vnfr['vnfd-ref'],
+                 vnfr['vim-account-id'],
                  vnfr['ip-address']])
     else:
         table = PrettyTable(