projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New options for nfpkg-create: override-epa, override-nonepa, override-paravirt
[osm/osmclient.git]
/
osmclient
/
sol005
/
client.py
diff --git
a/osmclient/sol005/client.py
b/osmclient/sol005/client.py
index
3ceb1b3
..
379951b
100644
(file)
--- a/
osmclient/sol005/client.py
+++ b/
osmclient/sol005/client.py
@@
-55,11
+55,12
@@
class Client(object):
self._user = user
self._password = password
self._project = project
self._user = user
self._password = password
self._project = project
+ self._project_domain_name = kwargs.get("project_domain_name")
+ self._user_domain_name = kwargs.get("user_domain_name")
self._logger = logging.getLogger('osmclient')
self._auth_endpoint = '/admin/v1/tokens'
self._headers = {}
self._token = None
self._logger = logging.getLogger('osmclient')
self._auth_endpoint = '/admin/v1/tokens'
self._headers = {}
self._token = None
-
if len(host.split(':')) > 1:
# backwards compatible, port provided as part of host
self._host = host.split(':')[0]
if len(host.split(':')) > 1:
# backwards compatible, port provided as part of host
self._host = host.split(':')[0]
@@
-69,7
+70,7
@@
class Client(object):
self._so_port = so_port
self._http_client = http.Http(
self._so_port = so_port
self._http_client = http.Http(
- 'https://{}:{}/osm'.format(self._host,self._so_port))
+ 'https://{}:{}/osm'.format(self._host,self._so_port)
, **kwargs
)
self._headers['Accept'] = 'application/json'
self._headers['Content-Type'] = 'application/yaml'
http_header = ['{}: {}'.format(key, val)
self._headers['Accept'] = 'application/json'
self._headers['Content-Type'] = 'application/yaml'
http_header = ['{}: {}'.format(key, val)
@@
-104,8
+105,13
@@
class Client(object):
postfields_dict = {'username': self._user,
'password': self._password,
'project_id': self._project}
postfields_dict = {'username': self._user,
'password': self._password,
'project_id': self._project}
+ if self._project_domain_name:
+ postfields_dict["project_domain_name"] = self._project_domain_name
+ if self._user_domain_name:
+ postfields_dict["user_domain_name"] = self._user_domain_name
http_code, resp = self._http_client.post_cmd(endpoint=self._auth_endpoint,
http_code, resp = self._http_client.post_cmd(endpoint=self._auth_endpoint,
- postfields_dict=postfields_dict)
+ postfields_dict=postfields_dict,
+ skip_query_admin=True)
# 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)
@@
-120,6
+126,15
@@
class Client(object):
self._http_client.set_http_header(http_header)
def get_version(self):
self._http_client.set_http_header(http_header)
def get_version(self):
- _, resp = self._http_client.get2_cmd(endpoint="/version")
+ _, resp = self._http_client.get2_cmd(endpoint="/version"
, skip_query_admin=True
)
resp = json.loads(resp)
return "{} {}".format(resp.get("version"), resp.get("date"))
resp = json.loads(resp)
return "{} {}".format(resp.get("version"), resp.get("date"))
+
+ def set_default_params(self, **kwargs):
+ host = kwargs.pop('host', None)
+ if host != None:
+ self._host=host
+ port = kwargs.pop('port', None)
+ if port != None:
+ self._so_port=port
+ self._http_client.set_query_admin(**kwargs)