From 7a1e0c8a922f60b9443179ca874d5966afdc54a7 Mon Sep 17 00:00:00 2001 From: Mariusz Wagner Date: Tue, 31 Jul 2018 09:32:05 +0200 Subject: Cleaning tests - Removed problem with version docker package - Change from python2 to python3 Issue-ID: INT-604 Change-Id: I4c5669926198569871634a7fed541b21aaa91eb9 Signed-off-by: Mariusz Wagner --- .../dcaegen2/prh-testcases/resources/docker-compose.yml | 4 ---- .../tests/dcaegen2/prh-testcases/resources/simulator/AAI.py | 11 ++++++----- .../prh-testcases/resources/simulator/AAI_simulator | 4 +--- .../dcaegen2/prh-testcases/resources/simulator/DMaaP.py | 13 ++++++------- .../prh-testcases/resources/simulator/DMaaP_simulator | 4 +--- 5 files changed, 14 insertions(+), 22 deletions(-) (limited to 'test/csit/tests/dcaegen2') diff --git a/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index 3cac3b41b..b1f84fda2 100644 --- a/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -25,8 +25,6 @@ services: build: context: simulator dockerfile: DMaaP_simulator - args: - - https_proxy=${HTTPS_PROXY} ports: - "2222:2222" container_name: dmaap_simulator @@ -35,8 +33,6 @@ services: build: context: simulator dockerfile: AAI_simulator - args: - - https_proxy=${HTTPS_PROXY} ports: - "3333:3333" container_name: aai_simulator diff --git a/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py index ca8bdd1f6..e70d8d30f 100644 --- a/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py +++ b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py @@ -1,11 +1,12 @@ -import BaseHTTPServer +from http.server import BaseHTTPRequestHandler +from http.server import HTTPServer import re import sys pnfs = 'Empty' -class AAIHandler(BaseHTTPServer.BaseHTTPRequestHandler): +class AAIHandler(BaseHTTPRequestHandler): def do_PUT(self): if re.search('/set_pnfs', self.path): global pnfs @@ -16,7 +17,7 @@ class AAIHandler(BaseHTTPServer.BaseHTTPRequestHandler): return def do_PATCH(self): - pnfs_name = '/aai/v12/network/pnfs/pnf/' + pnfs + pnfs_name = '/aai/v12/network/pnfs/pnf/' + pnfs.decode() if re.search('wrong_aai_record', self.path): self.send_response(400) self.end_headers() @@ -33,7 +34,7 @@ def _header_200_and_json(self): self.end_headers() -def _main_(handler_class=AAIHandler, server_class=BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): +def _main_(handler_class=AAIHandler, server_class=HTTPServer, protocol="HTTP/1.0"): if sys.argv[1:]: port = int(sys.argv[1]) @@ -46,7 +47,7 @@ def _main_(handler_class=AAIHandler, server_class=BaseHTTPServer.HTTPServer, pro httpd = server_class(server_address, handler_class) sa = httpd.socket.getsockname() - print "Serving HTTP on", sa[0], "port", sa[1], "..." + print("Serving HTTP on", sa[0], "port", sa[1], "...") httpd.serve_forever() diff --git a/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI_simulator b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI_simulator index 9566c47a9..013cd0a65 100644 --- a/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI_simulator +++ b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI_simulator @@ -1,9 +1,7 @@ -FROM python:2 +FROM python:3 ADD AAI.py / -RUN pip install robotframework - EXPOSE 3333 CMD [ "python", "./AAI.py" ] diff --git a/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py index dd2d19451..210378421 100644 --- a/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py +++ b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py @@ -1,12 +1,13 @@ -import BaseHTTPServer +from http.server import BaseHTTPRequestHandler +from http.server import HTTPServer import re import sys -posted_event_from_prh = 'Empty' +posted_event_from_prh = b'Empty' received_event_to_get_method = 'Empty' -class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler): +class DMaaPHandler(BaseHTTPRequestHandler): def do_PUT(self): if re.search('/set_get_event', self.path): global received_event_to_get_method @@ -29,11 +30,9 @@ class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler): if re.search('/events/unauthenticated.SEC_OTHER_OUTPUT/OpenDcae-c12/c12', self.path): _header_200_and_json(self) self.wfile.write(received_event_to_get_method) - self.wfile.close() elif re.search('/events/pnfReady', self.path): _header_200_and_json(self) self.wfile.write(posted_event_from_prh) - self.wfile.close() return @@ -44,7 +43,7 @@ def _header_200_and_json(self): self.end_headers() -def _main_(handler_class=DMaaPHandler, server_class=BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): +def _main_(handler_class=DMaaPHandler, server_class=HTTPServer, protocol="HTTP/1.0"): if sys.argv[1:]: port = int(sys.argv[1]) @@ -57,7 +56,7 @@ def _main_(handler_class=DMaaPHandler, server_class=BaseHTTPServer.HTTPServer, p httpd = server_class(server_address, handler_class) sa = httpd.socket.getsockname() - print "Serving HTTP on", sa[0], "port", sa[1], "..." + print("Serving HTTP on", sa[0], "port", sa[1], "...") httpd.serve_forever() diff --git a/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP_simulator b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP_simulator index 20761e7e8..cf4160c89 100644 --- a/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP_simulator +++ b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP_simulator @@ -1,9 +1,7 @@ -FROM python:2 +FROM python:3 ADD DMaaP.py / -RUN pip install robotframework - EXPOSE 2222 CMD [ "python", "./DMaaP.py" ] -- cgit 1.2.3-korg