CSIT tests update for Synchronous VES collector

-When evens belonging to different domains are reported in eventBatch
-When different stndDefinedNamespace is used if domain==stndDefined
-Error codes resulting from DMaaP-MR errors, mapped to HTTP/503

Issue-ID: DCAEGEN2-1483
Signed-off-by: Pawel <pawel.kasperkiewicz@nokia.com>
Change-Id: I4c993e4c7bfd22981030c69e126e90bbf7e48d4a

3 files changed, 15 insertions, 2 deletions

diff --git a/tests/dcaegen2/testcases/resources/robot_library/DmaapLibrary.py b/tests/dcaegen2/testcases/resources/robot_library/DmaapLibrary.py
index c9a0ff7b..f79ba04e 100644
--- a/tests/dcaegen2/testcases/resources/robot_library/DmaapLibrary.py
+++ b/tests/dcaegen2/testcases/resources/robot_library/DmaapLibrary.py
@@ -49,6 +49,7 @@ class DmaapLibrary(object):
 
     @staticmethod
     def cleanup_ves_events():
+        DmaapLibrary.dmaap_server.reset_dmaap_succesfull_code()
         if DmaapLibrary.server_thread is not None:
             DmaapLibrary.dmaap_queue.clean_up_event()
             logger.console("DMaaP event queue is cleaned up")
@@ -77,3 +78,7 @@ class DmaapLibrary(object):
                 return 'true'
             evt_str = DmaapLibrary.dmaap_queue.deque_event()
         return 'false'
+
+    @staticmethod
+    def set_successfull_dmaap_code(code):
+        DmaapLibrary.dmaap_server.set_dmaap_successfull_code(int(code))
\ No newline at end of file
diff --git a/tests/dcaegen2/testcases/resources/robot_library/dmaap_simulator/DMaaPHandler.py b/tests/dcaegen2/testcases/resources/robot_library/dmaap_simulator/DMaaPHandler.py
index f1c46e19..cc73c36a 100644
--- a/tests/dcaegen2/testcases/resources/robot_library/dmaap_simulator/DMaaPHandler.py
+++ b/tests/dcaegen2/testcases/resources/robot_library/dmaap_simulator/DMaaPHandler.py
@@ -19,9 +19,11 @@ try:
 except ImportError:
     from StringIO import StringIO
 
-
 class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
+    DEFAULT_SUCCES_RESPONSE_CODE=200
+    succes_response_code=DEFAULT_SUCCES_RESPONSE_CODE
+
     def __init__(self, dmaap_simulator, *args):
         self.dmaap_simulator = dmaap_simulator
         BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, *args)
@@ -66,7 +68,7 @@ class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         if 'clientThrottlingState' in self.requestline:
             self.send_response(204)
         else:
-            self.send_response(200)
+            self.send_response(self.succes_response_code)
             self.send_header('Content-Type', 'application/json')
             self.end_headers()
             self.wfile.write("{'count': 1, 'serverTimeMs': 3}")
diff --git a/tests/dcaegen2/testcases/resources/robot_library/dmaap_simulator/DMaaPServer.py b/tests/dcaegen2/testcases/resources/robot_library/dmaap_simulator/DMaaPServer.py
index 37499be8..8b66fd4d 100644
--- a/tests/dcaegen2/testcases/resources/robot_library/dmaap_simulator/DMaaPServer.py
+++ b/tests/dcaegen2/testcases/resources/robot_library/dmaap_simulator/DMaaPServer.py
@@ -14,6 +14,12 @@ class DMaaPServer(BaseHTTPServer.HTTPServer):
         serer_address = self.socket.getsockname()
         print "Serving HTTP on", serer_address[0], "port", serer_address[1], "..."
 
+    def set_dmaap_successfull_code(self,code_number):
+        DMaaPHandler.DMaaPHandler.succes_response_code=code_number
+
+    def reset_dmaap_succesfull_code(self):
+        DMaaPHandler.DMaaPHandler.succes_response_code=DMaaPHandler.DMaaPHandler.DEFAULT_SUCCES_RESPONSE_CODE
+
 
 def create_dmaap_server(dmaap_simulator, protocol="HTTP/1.0", port=3904):
     server_address = ('', port)