X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fclient.py;h=00c50cbf77438a41422e0f840cde5dd2c8b67dac;hb=274a00be45a43e5f42feb98bb5cc704bfc407c12;hp=379951b5bfeaa768c66a76af32c9efcacc43e7d2;hpb=c7393b88143880b33e7a46916159ed49049b58a2;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/client.py b/osmclient/sol005/client.py index 379951b..00c50cb 100644 --- a/osmclient/sol005/client.py +++ b/osmclient/sol005/client.py @@ -36,6 +36,7 @@ from osmclient.sol005 import role from osmclient.sol005 import pdud from osmclient.sol005 import k8scluster from osmclient.sol005 import repo +from osmclient.sol005 import osmrepo from osmclient.common import package_tool import json import logging @@ -93,6 +94,7 @@ class Client(object): self.pdu = pdud.Pdu(self._http_client, client=self) self.k8scluster = k8scluster.K8scluster(self._http_client, client=self) self.repo = repo.Repo(self._http_client, client=self) + self.osmrepo = osmrepo.OSMRepo(self._http_client, client=self) self.package_tool = package_tool.PackageTool(client=self) ''' self.vca = vca.Vca(http_client, client=self, **kwargs) @@ -127,8 +129,15 @@ class Client(object): 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)