From 08a9c63a95ad22472c358bd062d775d8b7b7505a Mon Sep 17 00:00:00 2001 From: grabinsk Date: Thu, 23 May 2019 13:34:38 +0200 Subject: Improve PRH tests to make json comparison more flexible Update expected PNF ready event to be an array of events Improve logging in DMaaP simulator Change-Id: I1c6c76dd7ef742fd474870b0cb23b5bbaa265357 Issue-ID: DCAEGEN2-1501 Signed-off-by: grabinsk --- tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tests/dcaegen2/prh-testcases/resources/simulator') diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py index 92985cb6..7507a46b 100644 --- a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py +++ b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py @@ -41,7 +41,7 @@ class DmaapSetup(BaseHTTPRequestHandler): global ves_event ves_event = httpServerLib.get_payload(self) httpServerLib.set_response_200_ok(self) - logger.debug('DmaapSetup PUT /setup/ves_event -> 200 OK') + logger.debug('DmaapSetup PUT /setup/ves_event -> 200 OK, content: ' + ves_event.decode("utf-8")) else: httpServerLib.set_response_404_not_found(self) logger.info('DmaapSetup PUT ' + self.path + ' -> 404 Not found') @@ -73,7 +73,8 @@ class DMaaPHandler(BaseHTTPRequestHandler): global captured_prh_event captured_prh_event = httpServerLib.get_payload(self) httpServerLib.set_response_200_ok(self) - logger.debug('DMaaPHandler POST /events/unauthenticated.PNF_READY -> 200') + logger.debug('DMaaPHandler POST /events/unauthenticated.PNF_READY -> 200, content: ' + + captured_prh_event.decode("utf-8")) else: httpServerLib.set_response_404_not_found(self) logger.info('DMaaPHandler POST ' + self.path + ' -> 404 Not found') @@ -86,6 +87,9 @@ class DMaaPHandler(BaseHTTPRequestHandler): if re.search('/events/unauthenticated.VES_PNFREG_OUTPUT/OpenDCAE-c12/c12', self.path): global ves_event httpServerLib.set_response_200_ok(self, payload = ves_event) + logger.debug( + 'DMaaPHandler GET /events/unauthenticated.VES_PNFREG_OUTPUT/OpenDcae-c12/c12 -> 200, content: ' + + ves_event.decode("utf-8")) ves_event = DMAAP_EMPTY logger.debug('DMaaPHandler GET /events/unauthenticated.VES_PNFREG_OUTPUT/OpenDcae-c12/c12 -> 200') else: -- cgit 1.2.3-korg