From cd057060c750914f9a1ca3578edc9f0223c73bd9 Mon Sep 17 00:00:00 2001 From: kurczews Date: Thu, 18 Apr 2019 14:56:41 +0200 Subject: PRH BBS tests - part 2 Issue-ID: INT-989 Change-Id: Ifa55723579d763e4bede7dbc373c7605dccb9b0e Signed-off-by: kurczews --- tests/dcaegen2/prh-testcases/resources/simulator/AAI.py | 12 +++++++----- tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'tests/dcaegen2/prh-testcases/resources/simulator') diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py index 55b2d1f6..4457ef15 100644 --- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py +++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py @@ -27,12 +27,12 @@ class AAISetup(BaseHTTPRequestHandler): def do_GET(self): try: - if re.search('/setup/get_patched_pnf', self.path): + if re.search('/setup/patched_pnf', self.path): httpServerLib.set_response_200_ok(self, payload = patched_pnf) - logger.debug('AAISetup GET /setup/get_patched_pnf -> 200 OK') - elif re.search('/setup/get_created_logical_link', self.path): + logger.debug('AAISetup GET /setup/patched_pnf -> 200 OK') + elif re.search('/setup/created_logical_link', self.path): httpServerLib.set_response_200_ok(self, payload = created_logical_link) - logger.debug('AAISetup GET /setup/get_created_logical_link -> 200 OK') + logger.debug('AAISetup GET /setup/created_logical_link -> 200 OK') else: httpServerLib.set_response_404_not_found(self) logger.info('AAISetup GET ' + self.path + ' -> 404 Not found') @@ -129,7 +129,9 @@ class AAIHandler(BaseHTTPRequestHandler): created_logical_link = httpServerLib.get_payload(self) httpServerLib.set_response_200_ok(self) - logger.debug('AAIHandler PUT /aai/v12/network/logical-links/logical-link/' + created_logical_link + ' -> 200 OK') + + logical_link_name = basename(self.path) + logger.debug('AAIHandler PUT /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK') else: httpServerLib.set_response_404_not_found(self) logger.info('AAIHandler PUT ' + self.path + ' -> 404 Not found') diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py index b2716968..92985cb6 100644 --- a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py +++ b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py @@ -24,10 +24,10 @@ class DmaapSetup(BaseHTTPRequestHandler): def do_GET(self): try: - if re.search('/setup/get_pnf_ready', self.path): + if re.search('/setup/pnf_ready', self.path): global captured_prh_event httpServerLib.set_response_200_ok(self, payload = captured_prh_event) - logger.debug('DmaapSetup GET /setup/get_pnf_ready -> 200 OK') + logger.debug('DmaapSetup GET /setup/pnf_ready -> 200 OK') else: httpServerLib.set_response_404_not_found(self) logger.info('DmaapSetup GET ' + self.path + ' -> 404 Not found') @@ -37,11 +37,11 @@ class DmaapSetup(BaseHTTPRequestHandler): def do_PUT(self): try: - if re.search('/setup/set_ves_event', self.path): + if re.search('/setup/ves_event', self.path): global ves_event ves_event = httpServerLib.get_payload(self) httpServerLib.set_response_200_ok(self) - logger.debug('DmaapSetup PUT /setup/set_ves_event -> 200 OK') + logger.debug('DmaapSetup PUT /setup/ves_event -> 200 OK') else: httpServerLib.set_response_404_not_found(self) logger.info('DmaapSetup PUT ' + self.path + ' -> 404 Not found') -- cgit 1.2.3-korg