Merge "Fix AAI simulator"

diff --git a/.gitignore b/.gitignore
index 674baf5..5ba8f9a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,6 @@ env.properties
 .DS_Store
 .idea
 *.iml
+*.pyc
 
 /bin/

diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
index 2788365..baa8165 100644 (file)
--- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
@@ -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):
+        if re.search('/set_pnf$', self.path): # to avoid regex collisions '$' must be added
             global pnf_name
             content_length = self._get_content_length()
-            pnf_name = self.rfile.read(content_length)
+            pnf_name = self.rfile.read(content_length).decode()
             _mark_response_as_http_ok(self)
 
         if re.search('/set_pnf_entry',self.path):
@@ -94,4 +94,4 @@ def _main_(handler_class=AAIHandler, protocol="HTTP/1.0"):
 
 
 if __name__ == '__main__':
-    _main_()
+    _main_()
\ No newline at end of file