Code Review / integration / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[DCAEGEN2] Align PRH CSITs to use AAI v23
[integration/csit.git] / tests / dcaegen2 / prh-testcases / resources / simulator / AAI.py
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
index fbfc5af..c6a320a 100644 (file)
--- 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')
@@ -61,22 +54,21 @@ class AAISetup(BaseHTTPRequestHandler):
 
                 httpServerLib.set_response_200_ok(self)
                 logger.debug('AAISetup PUT /setup/add_pnf_entry [' + pnf_name + '] -> 200 OK')
-            elif re.search('/setup/add_service_instace', self.path):
+            elif re.search('/setup/add_service_instance', self.path):
                 service_instance_payload = httpServerLib.get_payload(self)
                 global service_instance
                 service_instance = json.loads(service_instance_payload)
                 httpServerLib.set_response_200_ok(self)
-                logger.debug('AAISetup PUT /setup/add_service_instace -> 200 OK')
+                logger.debug('AAISetup PUT /setup/add_service_instance -> 200 OK')
             elif re.search('/setup/add_logical_link', self.path):
                 logical_link_payload = httpServerLib.get_payload(self)
                 logical_link_name = json.loads(logical_link_payload).get("link-name")
                 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')
 
@@ -116,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 logical_link_name in logical_links:
-                    httpServerLib.set_response_200_ok(self, payload = logical_links[logical_link_name])
-                    logger.debug('AAIHandler GET /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK')
+                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/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 entries: ' + str(logical_links.keys()))
-            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):
+                    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/network/pnfs/pnf/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')
@@ -144,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')
@@ -164,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')
@@ -181,12 +173,15 @@ 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)
 
-                del logical_links[logical_link_name]
-                logger.debug('AAIHandler DELETE /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK')
+                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/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')
@@ -204,4 +199,4 @@ def _main_(handler_class=AAIHandler, protocol="HTTP/1.0"):
 
 
 if __name__ == '__main__':
-    _main_()
\ No newline at end of file
+    _main_()
This repo holds all the Continuous System Integration Testing (CSIT) configuration for all ONAP projects.