X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fclient.py;h=4f15fc5e59b95a50300420b8dcab25ed342427f1;hb=418b29773f44b656631082cc975ee8dd22e54473;hp=57bc2b1345e1fcedec77627b0df38342bf11cac9;hpb=961145b6c1ab65c8cc5953aae008781e285c1461;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/client.py b/osmclient/sol005/client.py index 57bc2b1..4f15fc5 100644 --- a/osmclient/sol005/client.py +++ b/osmclient/sol005/client.py @@ -38,7 +38,9 @@ from osmclient.sol005 import k8scluster from osmclient.sol005 import vca from osmclient.sol005 import repo from osmclient.sol005 import osmrepo +from osmclient.sol005 import subscription from osmclient.common import package_tool +from osmclient.common.exceptions import ClientException import json import logging @@ -53,7 +55,6 @@ class Client(object): project="admin", **kwargs ): - self._user = user self._password = password self._project = project @@ -100,12 +101,13 @@ class Client(object): 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.subscription = subscription.Subscription(self._http_client, client=self) """ self.vca = vca.Vca(http_client, client=self, **kwargs) self.utils = utils.Utils(http_client, **kwargs) """ - def get_token(self): + def get_token(self, pwd_change=None): self._logger.debug("") if self._token is None: postfields_dict = { @@ -127,6 +129,10 @@ class Client(object): # raise ClientException(message) token = json.loads(resp) if resp else None + if token.get("message") == "change_password" and not pwd_change: + raise ClientException( + "Password Expired. Please update the password using change_password option" + ) self._token = token["id"] if self._token is not None: