diff options
| author |   Joanna Jeremicz <joanna.jeremicz@nokia.com> | 2019-10-07 13:30:50 +0200 |
|---|---|---|
| committer | Joanna Jeremicz <joanna.jeremicz@nokia.com> | 2019-10-09 07:46:36 +0200 |
| commit | 6019b87eda6806802822b2c3f7a66647a6cc32bc (patch) | |
| tree | 53050dea1e95826cc55919ad6be8f2a93939ebc0 /tests/dcaegen2 | |
| parent | 1f083f7f78f585c0c8129a2f4841509b8a277d2e (diff) | |
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
Diffstat (limited to 'tests/dcaegen2')
3 files changed, 4 insertions, 2 deletions
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 e4c3ba82..74948041 100644 --- 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 a4f87e05..276e15f6 100644 --- 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 d94ec1a1..eeb08265 100644 --- 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') |