Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: SetupFramework sparse file handling
[csit.git]
/
resources
/
libraries
/
python
/
HTTPRequest.py
diff --git
a/resources/libraries/python/HTTPRequest.py
b/resources/libraries/python/HTTPRequest.py
index
adf3d16
..
9c64dbb
100644
(file)
--- a/
resources/libraries/python/HTTPRequest.py
+++ b/
resources/libraries/python/HTTPRequest.py
@@
-18,6
+18,7
@@
The HTTP requests are implemented in the class HTTPRequest which uses
requests.request.
"""
requests.request.
"""
+from ipaddress import IPv6Address, AddressValueError
from enum import IntEnum, unique
from robot.api.deco import keyword
from enum import IntEnum, unique
from robot.api.deco import keyword
@@
-115,6
+116,14
@@
class HTTPRequest(object):
:return: Full url.
:rtype: str
"""
:return: Full url.
:rtype: str
"""
+
+ try:
+ IPv6Address(unicode(ip_addr))
+ # IPv6 address must be in brackets
+ ip_addr = "[{0}]".format(ip_addr)
+ except (AttributeError, AddressValueError):
+ pass
+
return "http://{ip}:{port}{path}".format(ip=ip_addr, port=port,
path=path)
return "http://{ip}:{port}{path}".format(ip=ip_addr, port=port,
path=path)
@@
-190,7
+199,7
@@
class HTTPRequest(object):
try:
auth = HTTPBasicAuth(node['honeycomb']['user'],
node['honeycomb']['passwd'])
try:
auth = HTTPBasicAuth(node['honeycomb']['user'],
node['honeycomb']['passwd'])
- rsp = request(method, url, auth=auth, **kwargs)
+ rsp = request(method, url, auth=auth,
verify=False,
**kwargs)
logger.debug("Status code: {0}".format(rsp.status_code))
logger.debug("Response: {0}".format(rsp.content))
logger.debug("Status code: {0}".format(rsp.status_code))
logger.debug("Response: {0}".format(rsp.content))
@@
-219,7
+228,7
@@
class HTTPRequest(object):
@staticmethod
@keyword(name="HTTP Get")
@staticmethod
@keyword(name="HTTP Get")
- def get(node, path, headers=None, timeout=1
0
, enable_logging=True):
+ def get(node, path, headers=None, timeout=1
5
, enable_logging=True):
"""Sends a GET request and returns the response and status code.
:param node: Honeycomb node.
"""Sends a GET request and returns the response and status code.
:param node: Honeycomb node.
@@
-245,7
+254,7
@@
class HTTPRequest(object):
@staticmethod
@keyword(name="HTTP Put")
@staticmethod
@keyword(name="HTTP Put")
- def put(node, path, headers=None, payload=None, json=None, timeout=1
0
):
+ def put(node, path, headers=None, payload=None, json=None, timeout=1
5
):
"""Sends a PUT request and returns the response and status code.
:param node: Honeycomb node.
"""Sends a PUT request and returns the response and status code.
:param node: Honeycomb node.
@@
-271,7
+280,7
@@
class HTTPRequest(object):
@staticmethod
@keyword(name="HTTP Post")
@staticmethod
@keyword(name="HTTP Post")
- def post(node, path, headers=None, payload=None, json=None, timeout=1
0
,
+ def post(node, path, headers=None, payload=None, json=None, timeout=1
5
,
enable_logging=True):
"""Sends a POST request and returns the response and status code.
enable_logging=True):
"""Sends a POST request and returns the response and status code.
@@
-303,7
+312,7
@@
class HTTPRequest(object):
@staticmethod
@keyword(name="HTTP Delete")
@staticmethod
@keyword(name="HTTP Delete")
- def delete(node, path, timeout=1
0
):
+ def delete(node, path, timeout=1
5
):
"""Sends a DELETE request and returns the response and status code.
:param node: Honeycomb node.
"""Sends a DELETE request and returns the response and status code.
:param node: Honeycomb node.