X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fclient.py;h=3ceb1b398741d53284f1d10535fc796e6b2ebaa4;hb=refs%2Fchanges%2F06%2F8606%2F1;hp=482cd737159fed1b58fcc53183a7994205698be0;hpb=e79f0cafb1e4f8b065708187c6dd0f58b56a2aeb;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/client.py b/osmclient/sol005/client.py index 482cd73..3ceb1b3 100644 --- a/osmclient/sol005/client.py +++ b/osmclient/sol005/client.py @@ -36,9 +36,9 @@ from osmclient.sol005 import role from osmclient.sol005 import pdud from osmclient.sol005 import k8scluster from osmclient.sol005 import repo -from osmclient.common.exceptions import ClientException from osmclient.common import package_tool import json +import logging class Client(object): @@ -55,6 +55,7 @@ class Client(object): self._user = user self._password = password self._project = project + self._logger = logging.getLogger('osmclient') self._auth_endpoint = '/admin/v1/tokens' self._headers = {} self._token = None @@ -98,15 +99,16 @@ class Client(object): ''' def get_token(self): + self._logger.debug("") if self._token is None: postfields_dict = {'username': self._user, 'password': self._password, 'project_id': self._project} http_code, resp = self._http_client.post_cmd(endpoint=self._auth_endpoint, postfields_dict=postfields_dict) - if http_code not in (200, 201, 202, 204): - message ='Authentication error: not possible to get auth token\nresp:\n{}'.format(resp) - raise ClientException(message) +# if http_code not in (200, 201, 202, 204): +# message ='Authentication error: not possible to get auth token\nresp:\n{}'.format(resp) +# raise ClientException(message) token = json.loads(resp) if resp else None self._token = token['id'] @@ -116,3 +118,8 @@ class Client(object): http_header = ['{}: {}'.format(key, val) for (key, val) in list(self._headers.items())] self._http_client.set_http_header(http_header) + + def get_version(self): + _, resp = self._http_client.get2_cmd(endpoint="/version") + resp = json.loads(resp) + return "{} {}".format(resp.get("version"), resp.get("date"))