X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;h=d581228273dc922334b3abfdb9acc3d0bd712df4;hb=d5f1feb7cca39d6421189b706c2933d5ee46ab7e;hp=78dd2329ed811205c3fd427b6e19b1b28f80e75c;hpb=da765d5ec750a9de0e4123d60ff211ca86a2ad61;p=osm%2Fosmclient.git diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py index 78dd232..d581228 100755 --- 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(