Merge "tests for ssl connection for PRH, AAI and DmaaP"

1 files changed, 7 insertions, 31 deletions

diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
index 76823b0d..416e7f45 100644
--- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
@@ -1,9 +1,7 @@
-import _thread
 import re
-import ssl
 import time
 from http.server import BaseHTTPRequestHandler
-from http.server import HTTPServer
+import httpServerLib
 
 pnfs = 'Empty'
 
@@ -15,7 +13,7 @@ class AAISetup(BaseHTTPRequestHandler):
             global pnfs
             content_length = int(self.headers['Content-Length'])
             pnfs = self.rfile.read(content_length)
-            _header_200_and_json(self)
+            httpServerLib.header_200_and_json(self)
 
         return
 
@@ -23,10 +21,11 @@ class AAISetup(BaseHTTPRequestHandler):
         if re.search('/reset', self.path):
             global pnfs
             pnfs = 'Empty'
-            _header_200_and_json(self)
+            httpServerLib.header_200_and_json(self)
 
         return
 
+
 class AAIHandler(BaseHTTPRequestHandler):
 
     def do_PATCH(self):
@@ -41,37 +40,14 @@ class AAIHandler(BaseHTTPRequestHandler):
         return
 
 
-def _header_200_and_json(self):
-    self.send_response(200)
-    self.send_header('Content-Type', 'application/json')
-    self.end_headers()
-
-
 def _main_(handler_class=AAIHandler, protocol="HTTP/1.0"):
     handler_class.protocol_version = protocol
-    _thread.start_new_thread(_init_http_endpoints, (3333, AAIHandler))
-    _thread.start_new_thread(_init_https_endpoints, (3334, AAIHandler))
-    _thread.start_new_thread(_init_http_endpoints, (3335, AAISetup))
+    httpServerLib.start_http_endpoint(3333, AAIHandler)
+    httpServerLib.start_https_endpoint(3334, AAIHandler)
+    httpServerLib.start_http_endpoint(3335, AAISetup)
     while 1:
         time.sleep(10)
 
 
-def _init_http_endpoints(port, handler_class, server_class=HTTPServer):
-    server = server_class(('', port), handler_class)
-    sa = server.socket.getsockname()
-    print("Serving HTTP on", sa[0], "port", sa[1], "for", handler_class, "...")
-    server.serve_forever()
-
-
-def _init_https_endpoints(port, handler_class, server_class=HTTPServer):
-    server = server_class(('', port), handler_class)
-    server.socket = ssl.wrap_socket(server.socket,
-                                    keyfile="certs/server.key", certfile="certs/server.crt",
-                                    ca_certs="certs/client.crt", server_side=True)
-    sa = server.socket.getsockname()
-    print("Serving HTTPS on", sa[0], "port", sa[1], "for", handler_class, "...")
-    server.serve_forever()
-
-
 if __name__ == '__main__':
     _main_()