diff options
Diffstat (limited to 'tests')
5 files changed, 6 insertions, 4 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..e8d6bb72 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", "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..734a6f70 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", "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 eeb08265..05a4e19d 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/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service', self.path): + elif re.search('aai/v12/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/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service -> 200 OK') + logger.debug('AAIHandler GET aai/v12/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') diff --git a/tests/sdc-dcae-d/dcaed/sdc_dcaed_interface.robot b/tests/sdc-dcae-d/dcaed/sdc_dcaed_interface.robot index 6f95ebc5..98e02519 100644 --- a/tests/sdc-dcae-d/dcaed/sdc_dcaed_interface.robot +++ b/tests/sdc-dcae-d/dcaed/sdc_dcaed_interface.robot @@ -11,7 +11,7 @@ ${DCAE_CREATE_BLUEPRINT_PATH} /SERVICE/createBluePrint ${DCAE_VFCMT_TEMPLATE} create_vfcmt.jinja ${DCAE_COMPOSITION_TEMPLATE} dcae_composition.jinja ${DCAE_MONITORING_CONFIGURATION_TEMPLATE} dcae_monitoring_configuration.jinja -${DCAE_BE_ENDPOINT} http://localhost:8082 +${DCAE_BE_ENDPOINT} https://localhost:8444 *** Keywords *** Create Monitoring Template diff --git a/tests/sdc-dcae-d/dcaed/sdc_interface.robot b/tests/sdc-dcae-d/dcaed/sdc_interface.robot index c1ceca44..6853fcca 100755 --- a/tests/sdc-dcae-d/dcaed/sdc_interface.robot +++ b/tests/sdc-dcae-d/dcaed/sdc_interface.robot @@ -22,7 +22,7 @@ ${SDC_ARTIFACT_UPLOAD_TEMPLATE} artifact_upload.jinja ${SDC_USER_REMARKS_TEMPLATE} user_remarks.jinja ${SDC_RESOURCE_INSTANCE_TEMPLATE} resource_instance.jinja -${SDC_BE_ENDPOINT} http://localhost:8080 +${SDC_BE_ENDPOINT} ${SDC_BE_PROTOCOL}://localhost:${SDC_BE_PORT} *** Keywords *** Onboard DCAE Microservice |