summaryrefslogtreecommitdiffstats
path: root/robotframework-onap/ONAPLibrary
diff options
context:
space:
mode:
Diffstat (limited to 'robotframework-onap/ONAPLibrary')
-rw-r--r--robotframework-onap/ONAPLibrary/ProtobufKeywords.py8
-rw-r--r--robotframework-onap/ONAPLibrary/RequestsHelper.py9
-rw-r--r--robotframework-onap/ONAPLibrary/VESProtobuf.py11
3 files changed, 16 insertions, 12 deletions
diff --git a/robotframework-onap/ONAPLibrary/ProtobufKeywords.py b/robotframework-onap/ONAPLibrary/ProtobufKeywords.py
index 9fded9b..3e870d7 100644
--- a/robotframework-onap/ONAPLibrary/ProtobufKeywords.py
+++ b/robotframework-onap/ONAPLibrary/ProtobufKeywords.py
@@ -8,14 +8,14 @@ class ProtobufKeywords(object):
def __init__(self):
super(ProtobufKeywords, self).__init__()
+ self.vpf = VESProtobuf()
@keyword
def compare_file_to_message(self, file_name, message):
with open(file_name, "rb") as file_to_do:
return self.compare_two_messages(file_to_do.read(), message)
- @staticmethod
- def compare_two_messages(left, right):
- left_json = VESProtobuf.binary_to_json(left)
- right_json = VESProtobuf.binary_to_json(right)
+ def compare_two_messages(self, left, right):
+ left_json = self.vpf.binary_to_json(left)
+ right_json = self.vpf.binary_to_json(right)
return JSONKeywords().json_equals(left_json, right_json)
diff --git a/robotframework-onap/ONAPLibrary/RequestsHelper.py b/robotframework-onap/ONAPLibrary/RequestsHelper.py
index f818c54..9de2260 100644
--- a/robotframework-onap/ONAPLibrary/RequestsHelper.py
+++ b/robotframework-onap/ONAPLibrary/RequestsHelper.py
@@ -56,9 +56,12 @@ class RequestsHelper(object):
content_type="application/json", auth=None):
"""Runs a post request"""
logger.info("Creating session" + endpoint)
- md5 = hashlib.md5()
- md5.update(data)
- md5checksum = Base64Keywords().base64_encode(md5.hexdigest())
+ if not data:
+ md5 = hashlib.md5()
+ md5.update(data)
+ md5checksum = Base64Keywords().base64_encode(md5.hexdigest())
+ else:
+ md5checksum = None
self.requests.create_session(alias, endpoint, auth=auth)
headers = self.create_headers(sdc_user_id=sdc_user, accept=accept, content_type=content_type, md5=md5checksum)
resp = self.requests.post_request(alias, data_path, files=files, data=data, headers=headers)
diff --git a/robotframework-onap/ONAPLibrary/VESProtobuf.py b/robotframework-onap/ONAPLibrary/VESProtobuf.py
index d747a0d..b5a36bc 100644
--- a/robotframework-onap/ONAPLibrary/VESProtobuf.py
+++ b/robotframework-onap/ONAPLibrary/VESProtobuf.py
@@ -27,6 +27,7 @@ class VESProtobuf(object):
def __init__(self):
super(VESProtobuf, self).__init__()
+ self.message_descriptors = VESProtobuf.get_message_definitions()
@staticmethod
def create_ves_event():
@@ -109,12 +110,12 @@ class VESProtobuf(object):
@staticmethod
def get_message_definitions():
- return message_factory.GetMessages((VESProtobuf.create_ves_event(),))
+ messages = message_factory.GetMessages((VESProtobuf.create_ves_event(),))
+ message_factory._FACTORY = message_factory.MessageFactory()
+ return messages
- @staticmethod
- def binary_to_json(binary_message):
- defs = VESProtobuf.get_message_definitions()
- ves = defs['VesEvent']()
+ def binary_to_json(self, binary_message):
+ ves = self.message_descriptors['VesEvent']()
ves.MergeFromString(binary_message)
json = MessageToJson(ves)
return json