projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace pycurl library in osmclient by requests library
[osm/osmclient.git]
/
osmclient
/
sol005
/
client.py
diff --git
a/osmclient/sol005/client.py
b/osmclient/sol005/client.py
index
c7f043b
..
b05dbcc
100644
(file)
--- a/
osmclient/sol005/client.py
+++ b/
osmclient/sol005/client.py
@@
-40,6
+40,7
@@
from osmclient.sol005 import repo
from osmclient.sol005 import osmrepo
from osmclient.sol005 import subscription
from osmclient.common import package_tool
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
import json
import logging
@@
-54,7
+55,6
@@
class Client(object):
project="admin",
**kwargs
):
project="admin",
**kwargs
):
-
self._user = user
self._password = password
self._project = project
self._user = user
self._password = password
self._project = project
@@
-77,10
+77,7
@@
class Client(object):
)
self._headers["Accept"] = "application/json"
self._headers["Content-Type"] = "application/yaml"
)
self._headers["Accept"] = "application/json"
self._headers["Content-Type"] = "application/yaml"
- http_header = [
- "{}: {}".format(key, val) for (key, val) in list(self._headers.items())
- ]
- self._http_client.set_http_header(http_header)
+ self._http_client.set_http_header(self._headers)
self.vnfd = vnfd.Vnfd(self._http_client, client=self)
self.nsd = nsd.Nsd(self._http_client, client=self)
self.vnfd = vnfd.Vnfd(self._http_client, client=self)
self.nsd = nsd.Nsd(self._http_client, client=self)
@@
-107,7
+104,7
@@
class Client(object):
self.utils = utils.Utils(http_client, **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 = {
self._logger.debug("")
if self._token is None:
postfields_dict = {
@@
-129,15
+126,16
@@
class Client(object):
# raise ClientException(message)
token = json.loads(resp) if resp else None
# 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:
self._headers["Authorization"] = "Bearer {}".format(self._token)
self._token = token["id"]
if self._token is not None:
self._headers["Authorization"] = "Bearer {}".format(self._token)
- http_header = [
- "{}: {}".format(key, val)
- for (key, val) in list(self._headers.items())
- ]
- self._http_client.set_http_header(http_header)
+ self._http_client.set_http_header(self._headers)
+ return token
def get_version(self):
_, resp = self._http_client.get2_cmd(endpoint="/version", skip_query_admin=True)
def get_version(self):
_, resp = self._http_client.get2_cmd(endpoint="/version", skip_query_admin=True)