X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fdcaegen2%2Fprh-testcases%2Fresources%2Fsimulator%2FAAI.py;h=c6a320a34634594918769be6732b398288250e11;hb=48d53d26e157d195e4c31cdd1af933ed78212104;hp=05a4e19da864f14e3767776879b140dc54263f8b;hpb=5e2d4ba7b1cffa7fcf29c952f3434cac8bf98952;p=integration%2Fcsit.git diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py index 05a4e19d..c6a320a3 100644 --- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py +++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py @@ -108,25 +108,25 @@ class AAIHandler(BaseHTTPRequestHandler): def do_GET(self): try: - if re.search('/aai/v12/network/pnfs/pnf/[^/]*$', self.path): + if re.search('/aai/v23/network/pnfs/pnf/[^/]*$', self.path): pnf_name = basename(self.path) if pnf_name in pnf_entries: httpServerLib.set_response_200_ok(self, payload = pnf_entries[pnf_name]) - logger.debug('AAIHandler GET /aai/v12/network/pnfs/pnf/' + pnf_name + ' -> 200 OK') + logger.debug('AAIHandler GET /aai/v23/network/pnfs/pnf/' + pnf_name + ' -> 200 OK') else: httpServerLib.set_response_404_not_found(self) - logger.info('AAIHandler GET /aai/v12/network/pnfs/pnf/' + pnf_name + ' -> 404 Not found, actual entries: ' + str(pnf_entries.keys())) - elif re.search('/aai/v12/network/logical-links/logical-link/[^/]*$', self.path): + logger.info('AAIHandler GET /aai/v23/network/pnfs/pnf/' + pnf_name + ' -> 404 Not found, actual entries: ' + str(pnf_entries.keys())) + elif re.search('/aai/v23/network/logical-links/logical-link/[^/]*$', self.path): logical_link_name = basename(self.path) if json.loads(created_logical_link).get("link-name") == logical_link_name: httpServerLib.set_response_200_ok(self, payload = created_logical_link) - logger.debug('AAIHandler GET /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK') + logger.debug('AAIHandler GET /aai/v23/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK') else: httpServerLib.set_response_404_not_found(self) - logger.info('AAIHandler GET /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 404 Not found, actual link: ' + created_logical_link) - elif re.search('aai/v12/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service', self.path): + logger.info('AAIHandler GET /aai/v23/network/logical-links/logical-link/' + logical_link_name + ' -> 404 Not found, actual link: ' + created_logical_link) + elif re.search('aai/v23/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service', self.path): httpServerLib.set_response_200_ok(self, payload = json.dumps(service_instance).encode('utf-8')) - logger.debug('AAIHandler GET aai/v12/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service -> 200 OK') + logger.debug('AAIHandler GET aai/v23/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service -> 200 OK') else: httpServerLib.set_response_404_not_found(self) logger.info('AAIHandler GET ' + self.path + ' -> 404 Not found') @@ -136,17 +136,17 @@ class AAIHandler(BaseHTTPRequestHandler): def do_PATCH(self): try: - if re.search('/aai/v12/network/pnfs/pnf/[^/]*$', self.path): + if re.search('/aai/v23/network/pnfs/pnf/[^/]*$', self.path): pnf_name = basename(self.path) if pnf_name in pnf_entries: global patched_pnf patched_pnf = httpServerLib.get_payload(self) httpServerLib.set_response_200_ok(self) - logger.debug('AAIHandler PATCH /aai/v12/network/pnfs/pnf/' + pnf_name + ' -> 200 OK') + logger.debug('AAIHandler PATCH /aai/v23/network/pnfs/pnf/' + pnf_name + ' -> 200 OK') else: httpServerLib.set_response_404_not_found(self) - logger.info('AAIHandler PATCH /aai/v12/network/pnfs/pnf/' + pnf_name + ' -> 404 Not found, actual entries: ' + str(pnf_entries.keys())) + logger.info('AAIHandler PATCH /aai/v23/network/pnfs/pnf/' + pnf_name + ' -> 404 Not found, actual entries: ' + str(pnf_entries.keys())) else: httpServerLib.set_response_404_not_found(self) logger.info('AAIHandler PATCH ' + self.path + ' -> 404 Not found') @@ -156,14 +156,14 @@ class AAIHandler(BaseHTTPRequestHandler): def do_PUT(self): try: - if re.search('/aai/v12/network/logical-links/logical-link/[^/]*$', self.path): + if re.search('/aai/v23/network/logical-links/logical-link/[^/]*$', self.path): global created_logical_link created_logical_link = httpServerLib.get_payload(self) httpServerLib.set_response_200_ok(self) logical_link_name = basename(self.path) - logger.debug('AAIHandler PUT /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK') + logger.debug('AAIHandler PUT /aai/v23/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') @@ -173,7 +173,7 @@ class AAIHandler(BaseHTTPRequestHandler): def do_DELETE(self): try: - if re.search('/aai/v12/network/logical-links/logical-link/[^/]*\?resource-version=\d+$', self.path): + if re.search('/aai/v23/network/logical-links/logical-link/[^/]*\?resource-version=\d+$', self.path): httpServerLib.set_response_200_ok(self) logical_link_name = re.search('.+?(?=\?)', basename(self.path)).group(0) @@ -181,7 +181,7 @@ class AAIHandler(BaseHTTPRequestHandler): if json.loads(created_logical_link).get("link-name") == logical_link_name: created_logical_link = AAI_RESOURCE_NOT_FOUND - logger.debug('AAIHandler DELETE /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK') + logger.debug('AAIHandler DELETE /aai/v23/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK') else: httpServerLib.set_response_404_not_found(self) logger.info('AAIHandler DELETE ' + self.path + ' -> 404 Not found') @@ -199,4 +199,4 @@ def _main_(handler_class=AAIHandler, protocol="HTTP/1.0"): if __name__ == '__main__': - _main_() \ No newline at end of file + _main_()