Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Create unified service operations
[csit.git]
/
resources
/
libraries
/
python
/
HTTPRequest.py
diff --git
a/resources/libraries/python/HTTPRequest.py
b/resources/libraries/python/HTTPRequest.py
index
5f87484
..
c4e73c2
100644
(file)
--- a/
resources/libraries/python/HTTPRequest.py
+++ b/
resources/libraries/python/HTTPRequest.py
@@
-1,4
+1,4
@@
-# Copyright (c) 201
6
Cisco and/or its affiliates.
+# Copyright (c) 201
7
Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@
-27,8
+27,6
@@
from robot.libraries.BuiltIn import BuiltIn
from requests import request, RequestException, Timeout, TooManyRedirects, \
HTTPError, ConnectionError
from requests import request, RequestException, Timeout, TooManyRedirects, \
HTTPError, ConnectionError
-from requests.packages.urllib3 import disable_warnings
-from requests.packages.urllib3.exceptions import InsecureRequestWarning
from requests.auth import HTTPBasicAuth
from requests.auth import HTTPBasicAuth
@@
-75,12
+73,9
@@
class HTTPRequestError(Exception):
self._msg = "{0}: {1}".format(self.__class__.__name__, msg)
self._details = details
if enable_logging:
self._msg = "{0}: {1}".format(self.__class__.__name__, msg)
self._details = details
if enable_logging:
- logger.
error
(self._msg)
+ logger.
info
(self._msg)
logger.debug(self._details)
logger.debug(self._details)
- # suppress warnings about disabled SSL verification
- disable_warnings(InsecureRequestWarning)
-
def __repr__(self):
return repr(self._msg)
def __repr__(self):
return repr(self._msg)
@@
-129,8
+124,8
@@
class HTTPRequest(object):
except (AttributeError, AddressValueError):
pass
except (AttributeError, AddressValueError):
pass
- return "http
s
://{ip}:{port}{path}".format(ip=ip_addr, port=port,
-
path=path)
+ return "http://{ip}:{port}{path}".format(ip=ip_addr, port=port,
+ path=path)
@staticmethod
def _http_request(method, node, path, enable_logging=True, **kwargs):
@staticmethod
def _http_request(method, node, path, enable_logging=True, **kwargs):
@@
-184,9
+179,12
@@
class HTTPRequest(object):
"""
timeout = kwargs["timeout"]
"""
timeout = kwargs["timeout"]
- if BuiltIn().get_variable_value("${use_odl_client}"):
- # TODO: node["honeycomb"]["odl_port"]
+ use_odl = BuiltIn().get_variable_value("${use_odl_client}")
+
+ if use_odl:
port = 8181
port = 8181
+ # Using default ODL Restconf port
+ # TODO: add node["honeycomb"]["odl_port"] to topology, use it here
odl_url_part = "/network-topology:network-topology/topology/" \
"topology-netconf/node/vpp/yang-ext:mount"
else:
odl_url_part = "/network-topology:network-topology/topology/" \
"topology-netconf/node/vpp/yang-ext:mount"
else:
@@
-233,7
+231,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.
@@
-259,7
+257,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.
@@
-285,7
+283,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.
@@
-317,7
+315,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.