X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;h=18b8033bf939db8da7a487a4a393a1b394b5e405;hb=5fea1eddc3aa6d403dd6bfa26455743dafc75f5f;hp=7178d26026608aa03cdbeccd1777d9f5ec2809ee;hpb=a2999a460707408e636d81fe8e735a7625def0d4;p=osm%2Fosmclient.git diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py index 7178d26..18b8033 100755 --- a/osmclient/scripts/osm.py +++ b/osmclient/scripts/osm.py @@ -28,6 +28,7 @@ import time import pycurl import os import textwrap +import pkg_resources def wrap_text(text, width): @@ -2500,9 +2501,9 @@ def k8scluster_show(ctx, name, literal): @click.argument('name') @click.argument('uri') @click.option('--type', - type=click.Choice(['chart', 'bundle']), + type=click.Choice(['helm-chart', 'juju-bundle']), prompt=True, - help='type of repo (chart for helm-charts, bundle for juju-bundles)') + help='type of repo (helm-chart for Helm Charts, juju-bundle for Juju Bundles)') @click.option('--description', default='', help='human readable description') @@ -2538,8 +2539,8 @@ def repo_add(ctx, @click.argument('name') @click.option('--newname', help='New name for the repo') @click.option('--uri', help='URI of the repo') -@click.option('--type', type=click.Choice(['chart', 'bundle']), - help='type of repo (chart for helm-charts, bundle for juju-bundles)') +@click.option('--type', type=click.Choice(['helm-chart', 'juju-bundle']), + help='type of repo (helm-chart for Helm Charts, juju-bundle for Juju Bundles)') @click.option('--description', help='human readable description') #@click.option('--wait', # is_flag=True, @@ -3023,7 +3024,8 @@ def ns_metric_export(ctx, ns, vnf, vdu, metric, interval): def get_version(ctx): try: check_client_version(ctx.obj, "version") - print (ctx.obj.get_version()) + print ("Server version: {}".format(ctx.obj.get_version())) + print ("Client version: {}".format(pkg_resources.get_distribution("osmclient").version)) except ClientException as e: print(str(e)) exit(1)