diff options
Diffstat (limited to 'robotframework-onap/ONAPLibrary/BaseSDCKeywords.py')
-rw-r--r-- | robotframework-onap/ONAPLibrary/BaseSDCKeywords.py | 59 |
1 files changed, 10 insertions, 49 deletions
diff --git a/robotframework-onap/ONAPLibrary/BaseSDCKeywords.py b/robotframework-onap/ONAPLibrary/BaseSDCKeywords.py index 0ec8cf5..de53dd1 100644 --- a/robotframework-onap/ONAPLibrary/BaseSDCKeywords.py +++ b/robotframework-onap/ONAPLibrary/BaseSDCKeywords.py @@ -11,14 +11,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from RequestsLibrary import RequestsLibrary -from robot.api import logger + from robot.api.deco import keyword from robot.libraries.BuiltIn import BuiltIn -import hashlib -from ONAPLibrary.Base64Keywords import Base64Keywords from ONAPLibrary.RequestsHelper import RequestsHelper @@ -34,63 +31,27 @@ class BaseSDCKeywords(object): @keyword def run_get_request(self, endpoint, data_path, user, accept="application/json", auth=None): """Runs an SDC get request""" - resp = self.get_request(endpoint, data_path, user, accept, auth) + resp = self.reqs.get_request("sdc", endpoint, data_path, user, accept, auth) self.builtin.should_be_equal_as_strings(resp.status_code, "200") return resp @keyword def run_post_request(self, endpoint, data_path, data, user, accept="application/json", auth=None): """Runs an SDC post request""" - return self.post_request(endpoint, data_path, data, user, files=None, accept=accept, auth=auth) + return self.reqs.post_request("sdc", endpoint, data_path, data, user, files=None, accept=accept, auth=auth) @keyword def run_post_files_request(self, endpoint, data_path, files, user, accept="application/json", auth=None): """Runs an SDC post files request""" - return self.post_request(endpoint, data_path, files, user, files=None, accept=accept, - content_type="multipart/form-data", auth=auth) + return self.reqs.post_request("sdc", endpoint, data_path, files, user, files=None, accept=accept, + content_type="multipart/form-data", auth=auth) @keyword def run_put_request(self, endpoint, data_path, data, user, accept="application/json", auth=None): """Runs an SDC post request""" - return self.put_request(endpoint, data_path, data, user, accept, auth) - - def get_request(self, endpoint, data_path, user, accept="application/json", auth=None): - """Runs an SDC get request""" - logger.info("Creating session" + endpoint) - RequestsLibrary().create_session("sdc", endpoint, auth=auth) - headers = self.reqs.create_headers(sdc_user_id=user, accept=accept) - resp = RequestsLibrary().get_request("sdc", data_path, headers=headers) - logger.info("Received response from sdc " + resp.text) - return resp - - def post_request(self, endpoint, data_path, data, user, files=None, accept="application/json", - content_type="application/json", auth=None): - """Runs an SDC post request""" - logger.info("Creating session" + endpoint) - md5 = hashlib.md5() - md5.update(data) - md5checksum = Base64Keywords().base64_encode(md5.hexdigest()) - RequestsLibrary().create_session("sdc", endpoint, auth=auth) - headers = self.reqs.create_headers(user, accept=accept, content_type=content_type, md5=md5checksum) - resp = RequestsLibrary().post_request("sdc", data_path, files=files, data=data, headers=headers) - - logger.info("Received response from sdc " + resp.text) - return resp - - def put_request(self, endpoint, data_path, data, user, accept="application/json", auth=None): - """Runs an SDC post request""" - logger.info("Creating session" + endpoint) - RequestsLibrary().create_session("sdc", endpoint, auth=auth) - headers = self.reqs.create_headers(sdc_user_id=user, accept=accept) - resp = RequestsLibrary().put_request("sdc", data_path, data=data, headers=headers) - logger.info("Received response from sdc " + resp.text) - return resp + return self.reqs.put_request("sdc", endpoint, data_path, data, user, accept, auth) - def delete_request(self, endpoint, data_path, data, user, accept="application/json", auth=None): - """Runs an SDC post request""" - logger.info("Creating session" + endpoint) - RequestsLibrary().create_session("sdc", endpoint, auth=auth) - headers = self.reqs.create_headers(sdc_user_id=user, accept=accept) - resp = RequestsLibrary().delete_request("sdc", data_path, data=data, headers=headers) - logger.info("Received response from sdc " + resp.text) - return resp + @keyword + def run_delete_request(self, endpoint, data_path, data, user, accept="application/json", auth=None): + """Runs an SDC delete request""" + return self.reqs.delete_request("sdc", endpoint, data_path, data, user, accept, auth) |