Merge changes Iff7ec8a9,I661d8abd
* changes:
Fix NST creation command
Fixed osm version for pre-7.0 version
diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index c5e8212..46ceb91 100755
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -1634,13 +1634,13 @@
help='overrides fields in descriptor, format: '
'"key1.key2...=value[;key3...=value;...]"')
@click.pass_context
-def nst_create1(ctx, charm_folder, overwrite):
+def nst_create1(ctx, filename, overwrite):
"""creates a new Network Slice Template (NST)
FILENAME: NST package folder, NST yaml file or NSTpkg tar.gz file
"""
logger.debug("")
- nst_create(ctx, charm_folder, overwrite)
+ nst_create(ctx, filename, overwrite)
@cli_osm.command(name='netslice-template-create', short_help='creates a new Network Slice Template (NST)')
diff --git a/osmclient/sol005/client.py b/osmclient/sol005/client.py
index 379951b..5e28797 100644
--- a/osmclient/sol005/client.py
+++ b/osmclient/sol005/client.py
@@ -127,8 +127,15 @@
def get_version(self):
_, resp = self._http_client.get2_cmd(endpoint="/version", skip_query_admin=True)
- resp = json.loads(resp)
- return "{} {}".format(resp.get("version"), resp.get("date"))
+ #print(http_code, resp)
+ try:
+ resp = json.loads(resp)
+ version = resp.get("version")
+ date = resp.get("date")
+ except ValueError:
+ version = resp.split()[2]
+ date = resp.split()[4]
+ return "{} {}".format(version, date)
def set_default_params(self, **kwargs):
host = kwargs.pop('host', None)