git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added basic authentication to SLA-Collector requests
[unfold.git]
/
sla
/
slaclient
/
restclient.py
diff --git
a/sla/slaclient/restclient.py
b/sla/slaclient/restclient.py
index
879c7a1
..
29fcae8
100755
(executable)
--- a/
sla/slaclient/restclient.py
+++ b/
sla/slaclient/restclient.py
@@
-114,12
+114,11
@@
class Client(object):
url = _buildpath_(self.rooturl, path)
if "testbed" in kwargs:
url = url + "?testbed=" + kwargs["testbed"]
url = _buildpath_(self.rooturl, path)
if "testbed" in kwargs:
url = url + "?testbed=" + kwargs["testbed"]
- #kwargs['params']['testbed'] = 'iminds'
if "headers" not in kwargs:
kwargs["headers"] = {"accept": "application/xml"}
if "headers" not in kwargs:
kwargs["headers"] = {"accept": "application/xml"}
-
#
kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER,
-
#
settings.SLA_MANAGER_PASSWORD)
+ kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER,
+ settings.SLA_MANAGER_PASSWORD)
for key, values in kwargs.iteritems():
print key, values
for key, values in kwargs.iteritems():
print key, values
@@
-152,8
+151,8
@@
class Client(object):
"""
url = _buildpath_(self.rooturl, path)
url = url + "?testbed=iminds" # TODO remove hardcoded string
"""
url = _buildpath_(self.rooturl, path)
url = url + "?testbed=iminds" # TODO remove hardcoded string
-
#
kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER,
-
#
settings.SLA_MANAGER_PASSWORD)
+ kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER,
+ settings.SLA_MANAGER_PASSWORD)
if "headers" not in kwargs:
kwargs = {"accept": "application/xml",
"content-type": "application/xml"}
if "headers" not in kwargs:
kwargs = {"accept": "application/xml",
"content-type": "application/xml"}