diff options
author | DR695H <dr695h@att.com> | 2019-06-13 14:40:27 -0400 |
---|---|---|
committer | Gary Wu <gary.wu@futurewei.com> | 2019-06-13 22:05:56 +0000 |
commit | 294f996db033c0f8be6143dad201dc9d8b4b6959 (patch) | |
tree | 94998644fda9a1b13ed4ffb0c786ab4e4f9170c6 /robotframework-onap/ONAPLibrary | |
parent | 0932c69548b13eab93f46e81f939dec2803cd741 (diff) |
move dns and uuid to the new format of keywords
Change-Id: I07612b85424c4d687b0c551ecc7727920d2736b0
Issue-ID: TEST-164
Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robotframework-onap/ONAPLibrary')
-rw-r--r-- | robotframework-onap/ONAPLibrary/BaseSOKeywords.py | 6 | ||||
-rw-r--r-- | robotframework-onap/ONAPLibrary/RequestSOKeywords.py | 3 | ||||
-rw-r--r-- | robotframework-onap/ONAPLibrary/SocketKeywords.py | 18 | ||||
-rw-r--r-- | robotframework-onap/ONAPLibrary/UUIDKeywords.py | 27 | ||||
-rw-r--r-- | robotframework-onap/ONAPLibrary/Utilities.py (renamed from robotframework-onap/ONAPLibrary/DNS.py) | 8 |
5 files changed, 54 insertions, 8 deletions
diff --git a/robotframework-onap/ONAPLibrary/BaseSOKeywords.py b/robotframework-onap/ONAPLibrary/BaseSOKeywords.py index 1c9f6f3..80ae40c 100644 --- a/robotframework-onap/ONAPLibrary/BaseSOKeywords.py +++ b/robotframework-onap/ONAPLibrary/BaseSOKeywords.py @@ -16,7 +16,7 @@ from robot.api import logger from robot.api.deco import keyword from robot.libraries.BuiltIn import BuiltIn -from eteutils.UUID import UUID +from ONAPLibrary.Utilities import Utilities class BaseSOKeywords(object): @@ -26,7 +26,7 @@ class BaseSOKeywords(object): def __init__(self): super(BaseSOKeywords, self).__init__() self.application_id = "robot-ete" - self.uuid = UUID() + self.uuid = Utilities() self.builtin = BuiltIn() @keyword @@ -56,7 +56,7 @@ class BaseSOKeywords(object): def create_headers(self, accept="application/json"): """Create the headers that are used by so""" - uuid = self.uuid.generate_UUID() + uuid = self.uuid.generate_uuid4() headers = { "Accept": accept, "Content-Type": "application/json", diff --git a/robotframework-onap/ONAPLibrary/RequestSOKeywords.py b/robotframework-onap/ONAPLibrary/RequestSOKeywords.py index 63ae063..fa32795 100644 --- a/robotframework-onap/ONAPLibrary/RequestSOKeywords.py +++ b/robotframework-onap/ONAPLibrary/RequestSOKeywords.py @@ -16,8 +16,6 @@ from robot.api import logger from robot.api.deco import keyword from robot.libraries.BuiltIn import BuiltIn -from eteutils.UUID import UUID - class RequestSOKeywords(object): """SO is an ONAP testing library for Robot Framework that provides functionality for interacting with the serivce @@ -26,7 +24,6 @@ class RequestSOKeywords(object): def __init__(self): super(RequestSOKeywords, self).__init__() self.application_id = "robot-ete" - self.uuid = UUID() self.builtin = BuiltIn() self.base_keywords = BaseSOKeywords() diff --git a/robotframework-onap/ONAPLibrary/SocketKeywords.py b/robotframework-onap/ONAPLibrary/SocketKeywords.py new file mode 100644 index 0000000..08a3fc7 --- /dev/null +++ b/robotframework-onap/ONAPLibrary/SocketKeywords.py @@ -0,0 +1,18 @@ +import socket +from robot.api.deco import keyword + + +class SocketKeywords(object): + """SocketKeywords are common resource for simple socket keywords.""" + + def __init__(self): + super(SocketKeywords, self).__init__() + + @keyword + def send_binary_data(self, host, port, data): + """ send raw bytes over tcp socket""" + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + # Connect to server and send data + sock.connect((host, int(port))) + sock.sendall(bytes(data)) + sock.close() diff --git a/robotframework-onap/ONAPLibrary/UUIDKeywords.py b/robotframework-onap/ONAPLibrary/UUIDKeywords.py new file mode 100644 index 0000000..3e85779 --- /dev/null +++ b/robotframework-onap/ONAPLibrary/UUIDKeywords.py @@ -0,0 +1,27 @@ +import uuid +import time +import datetime +from robot.api.deco import keyword + + +class UUIDKeywords(object): + """ Utilities useful for generating UUIDs """ + + def __init__(self): + super(UUIDKeywords, self).__init__() + + @keyword + def generate_uuid4(self): + """generate a uuid""" + return uuid.uuid4() + + @keyword + def generate_uuid1(self): + """generate a timestamp uuid""" + return uuid.uuid1() + + @keyword + def generate_timestamp(self): + """generate a timestamp""" + then = datetime.datetime.now() + return int(time.mktime(then.timetuple()) * 1e3 + then.microsecond / 1e3) diff --git a/robotframework-onap/ONAPLibrary/DNS.py b/robotframework-onap/ONAPLibrary/Utilities.py index bc215ed..9f1e0c0 100644 --- a/robotframework-onap/ONAPLibrary/DNS.py +++ b/robotframework-onap/ONAPLibrary/Utilities.py @@ -14,13 +14,17 @@ from ONAPLibrary.robotlibcore import HybridCore from ONAPLibrary.DNSKeywords import DNSKeywords +from ONAPLibrary.SocketKeywords import SocketKeywords +from ONAPLibrary.UUIDKeywords import UUIDKeywords -class DNS(HybridCore): +class Utilities(HybridCore): """ DNS Keywords are useful for DNS requests """ def __init__(self): self.keyword_implementors = [ - DNSKeywords() + DNSKeywords(), + SocketKeywords(), + UUIDKeywords() ] HybridCore.__init__(self, self.keyword_implementors) |