Add baseUrl to configuration

- Add support for baseUrl usage. It is needed for handling objects other than pnfs from the inventory.
BaseUrl is necessary for fixing the existing bug, where pnf path is used to get service-instance from AAI.
- Correct path in AAI simulator.

Issue-ID: INT-1181
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Change-Id: I4446556a610c0f47bee09ce8271eeb95df590004

diff --git a/tests/dcaegen2/prh-testcases/resources/prh_configs/prh-config.json b/tests/dcaegen2/prh-testcases/resources/prh_configs/prh-config.json
index e4c3ba8..7494804 100644 (file)
--- a/tests/dcaegen2/prh-testcases/resources/prh_configs/prh-config.json
+++ b/tests/dcaegen2/prh-testcases/resources/prh_configs/prh-config.json
@@ -16,6 +16,7 @@
   "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin",
   "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
   "aai.aaiClientConfiguration.pnfUrl": "https://aai:3334/aai/v12/network/pnfs/pnf",
+  "aai.aaiClientConfiguration.baseUrl": "https://aai:3334/aai/v12/network",
   "aai.aaiClientConfiguration.aaiUserName": "DCAE",
   "aai.aaiClientConfiguration.aaiUserPassword": "DCAE",
   "aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors": true,

diff --git a/tests/dcaegen2/prh-testcases/resources/prh_configs/prh-no-auth-config.json b/tests/dcaegen2/prh-testcases/resources/prh_configs/prh-no-auth-config.json
index a4f87e0..276e15f 100644 (file)
--- a/tests/dcaegen2/prh-testcases/resources/prh_configs/prh-no-auth-config.json
+++ b/tests/dcaegen2/prh-testcases/resources/prh_configs/prh-no-auth-config.json
@@ -16,6 +16,7 @@
   "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin",
   "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
   "aai.aaiClientConfiguration.pnfUrl": "http://aai:3333/aai/v12/network/pnfs/pnf",
+  "aai.aaiClientConfiguration.baseUrl": "https://aai:3334/aai/v12/network",
   "aai.aaiClientConfiguration.aaiUserName": "DCAE",
   "aai.aaiClientConfiguration.aaiUserPassword": "DCAE",
   "aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors": true,

diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
index d94ec1a..eeb0826 100644 (file)
--- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
@@ -124,9 +124,9 @@ class AAIHandler(BaseHTTPRequestHandler):
                 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 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):
+            elif re.search('aai/v12/network/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/v12/network/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')