Merge "Flatten configuration structure"

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/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
index bc6f238..7f53156 100644 (file)
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -97,7 +97,7 @@ services:
                                               "dmaap.dmaapConsumerConfiguration.dmaapUserPassword":"admin",
                                               "dmaap.dmaapConsumerConfiguration.dmaapContentType": "application/json",
                                               "dmaap.dmaapConsumerConfiguration.consumerId": "c12",
-                                              "dmaap.dmaapConsumerConfiguration.consumerGroup: "OpenDCAE-c12",
+                                              "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDCAE-c12",
                                               "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
                                               "dmaap.dmaapConsumerConfiguration.messageLimit": -1,
 
@@ -111,8 +111,8 @@ services:
 
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "dmaap-bc",
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2223,
-                                              "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName: "events/unauthenticated.PNF_UPDATE",
-                                              "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol: "http"
+                                              "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_UPDATE",
+                                              "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "http",
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin",
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin",
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
@@ -126,6 +126,13 @@ services:
                                               "aai.aaiClientConfiguration.aaiBasePath": "/aai/v12",
                                               "aai.aaiClientConfiguration.aaiPnfPath": "/network/pnfs/pnf",
                                               "aai.aaiClientConfiguration.aaiServiceInstancePath":"/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
+
+                                              "security.trustStorePath":"change it",
+                                              "security.trustStorePasswordPath":"change it",
+                                              "security.keyStorePath":"change it",
+                                              "security.keyStorePasswordPath":"change it",
+                                              "security.enableAaiCertAuth":false,
+                                              "security.enableDmaapCertAuth":false
                                             }'
     ]
     depends_on:

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