From: Marcin Migdal <marcin.migdal@nokia.com>
Date: Fri, 5 Apr 2019 13:00:36 +0000 (+0200)
Subject: Aming AAI SIM get
X-Git-Tag: 4.0.0-ONAP~86
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9ddc27a76e286e77843db7c1c7296732be559f8c;p=integration%2Fcsit.git

Aming AAI SIM get

Change-Id: If2f7d35716b6c6467263cf75fb4aadad31a855b8
Issue-ID: INT-989
Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
---

diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
index bd76c616..27883655 100644
--- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
@@ -16,7 +16,7 @@ logging.basicConfig(
 
 logger = logging.getLogger('AAI-simulator-logger')
 
-pnfs = 'Empty'
+pnf_name = 'Empty'
 pnf_entry = {}
 
 
@@ -29,10 +29,10 @@ class AAISetup(BaseHTTPRequestHandler):
 
     def do_PUT(self):
         logger.info('AAI SIM Setup Put execution')
-        if re.search('/set_pnf$', self.path):
-            global pnfs
+        if re.search('/set_pnf', self.path):
+            global pnf_name
             content_length = self._get_content_length()
-            pnfs = self.rfile.read(content_length)
+            pnf_name = self.rfile.read(content_length)
             _mark_response_as_http_ok(self)
 
         if re.search('/set_pnf_entry',self.path):
@@ -46,8 +46,8 @@ class AAISetup(BaseHTTPRequestHandler):
     def do_POST(self):
         logger.info('AAI SIM Setup Post execution')
         if re.search('/reset', self.path):
-            global pnfs
-            pnfs = 'Empty'
+            global pnf_name
+            pnf_name = 'Empty'
             _mark_response_as_http_ok(self)
 
         return
@@ -60,17 +60,18 @@ class AAIHandler(BaseHTTPRequestHandler):
 
     def do_GET(self):
         logger.info('AAI SIM Get execution')
-        if re.search('/get_pnf_entry', self.path):
+        full_request_path = '/aai/v12/network/pnfs/pnf/' + pnf_name
+        if re.search(full_request_path, self.path):
             _mark_response_as_http_ok(self)
             body = json.dumps(pnf_entry)
+            logger.info('AAI SIM Get json prepared')
             self.wfile.write(body.encode())
-
         return
 
 
     def do_PATCH(self):
         logger.info('AAI SIM Patch execution')
-        pnfs_name = '/aai/v12/network/pnfs/pnf/' + pnfs.decode()
+        pnfs_name = '/aai/v12/network/pnfs/pnf/' + pnf_name
         if re.search('wrong_aai_record', self.path):
             self.send_response(400)
             logger.info('Execution status 400')