diff options
Diffstat (limited to 'tests/dcaegen2/prh-testcases/resources/simulator/AAI.py')
| -rw-r--r-- | tests/dcaegen2/prh-testcases/resources/simulator/AAI.py | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py index e5f0b102..43f4fab5 100644 --- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py +++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py @@ -20,7 +20,6 @@ logger = logging.getLogger('AAI-simulator-logger') AAI_RESOURCE_NOT_FOUND = b'{}' pnf_entries = {} -logical_links = {} patched_pnf = AAI_RESOURCE_NOT_FOUND created_logical_link = AAI_RESOURCE_NOT_FOUND service_instance = AAI_RESOURCE_NOT_FOUND @@ -32,15 +31,9 @@ class AAISetup(BaseHTTPRequestHandler): if re.search('/setup/patched_pnf', self.path): httpServerLib.set_response_200_ok(self, payload = patched_pnf) logger.debug('AAISetup GET /setup/patched_pnf -> 200 OK') - elif re.search('/verify/created_logical_link', self.path): + elif re.search('/verify/logical-link', self.path): httpServerLib.set_response_200_ok(self, payload = created_logical_link) - logger.debug('AAISetup GET /setup/created_logical_link -> 200 OK') - elif re.search('/verify/logical-links', self.path): - httpServerLib.set_response_200_ok(self, payload= json.dumps(logical_links).encode('utf-8')) - elif re.search('/verify/logical-link/bbs-link', self.path): - link_name = basename(self.path) - if link_name in logical_links: - httpServerLib.set_response_200_ok(self, payload = logical_links[link_name]) + logger.debug('AAISetup GET /verify/logical_link -> 200 OK') else: httpServerLib.set_response_404_not_found(self) logger.info('AAISetup GET ' + self.path + ' -> 404 Not found') @@ -73,10 +66,9 @@ class AAISetup(BaseHTTPRequestHandler): if logical_link_name == None: raise Exception("Invalid logical link entry, could not extract `link-name`") - global logical_link - logical_links[logical_link_name] = logical_link_payload + global created_logical_link + created_logical_link = logical_link_payload - logical_link = json.loads(logical_link_payload) httpServerLib.set_response_200_ok(self) logger.debug('AAISetup PUT /setup/add_logical_link -> 200 OK') @@ -126,12 +118,12 @@ class AAIHandler(BaseHTTPRequestHandler): 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): logical_link_name = basename(self.path) - if logical_link_name in logical_links: - httpServerLib.set_response_200_ok(self, payload = logical_links[logical_link_name]) + 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') 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 entries: ' + str(logical_links.keys())) + 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/network/pnfs/pnf/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/network/pnfs/pnf/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service -> 200 OK') @@ -185,7 +177,10 @@ class AAIHandler(BaseHTTPRequestHandler): httpServerLib.set_response_200_ok(self) logical_link_name = re.search('.+?(?=\?)', basename(self.path)).group(0) - del logical_links[logical_link_name] + global created_logical_link + 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') else: httpServerLib.set_response_404_not_found(self) |