diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-09-10 12:47:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-10 12:47:45 +0000 |
| commit | 0005c2c2bc7f52dd0f8d738c970c900f3144b6f8 (patch) | |
| tree | fea8d36618977cca40ee3660667b432518d30ead /vid-app-common/src | |
| parent | 0c6e6465dd41404179b3b5848703b887003117da (diff) | |
| parent | 5a4680ac8eacfba3d38186528fea35524d0011f1 (diff) | |
Merge "update MSO configuration URL"
Diffstat (limited to 'vid-app-common/src')
3 files changed, 3 insertions, 3 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java index 94a7cf9f0..558dc269f 100644 --- a/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java @@ -138,7 +138,7 @@ public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests { public void shouldProperlyCreateConfigurationInstanceWithCorrectServiceInstanceId() throws Exception { // given String serviceInstanceId = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; - String endpointTemplate = String.format("/serviceInstances/v6/%s/configurations", serviceInstanceId); + String endpointTemplate = String.format("/serviceInstantiation/v7/serviceInstances/%s/configurations", serviceInstanceId); RequestDetailsWrapper requestDetailsWrapper = createRequestDetails(); MsoResponseWrapper expectedResponse = createOkResponse(); given(msoInterface.createConfigurationInstance(requestDetailsWrapper, endpointTemplate)) diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientNewTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientNewTest.java index 0217204d0..65cfcc18d 100644 --- a/vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientNewTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientNewTest.java @@ -359,7 +359,7 @@ public class MsoRestClientNewTest { @Test public void testSetConfigurationActiveStatus() throws Exception { - String endpoint = "/serviceInstances/v7/<service_instance_id>/configurations/<configuration_id>"; + String endpoint = "/serviceInstantiation/v7/serviceInstances/<service_instance_id>/configurations/<configuration_id>"; endpoint = endpoint.replace(MsoController.SVC_INSTANCE_ID, SERVICE_INSTANCE_ID); endpoint = endpoint.replace(MsoController.CONFIGURATION_ID, SAMPLE_CONFIGURATION_ID); endpoint = endpoint + "/activate"; diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties index fc5a32277..ecbc2373e 100644 --- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties +++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties @@ -168,7 +168,7 @@ mso.restapi.get.orc.req=/orchestrationRequests/v7 mso.restapi.get.orc.reqs=/orchestrationRequests/v7? mso.restapi.resume.orc.req=/orchestrationRequests/v7/<request_id>/resume mso.restapi.get.man.tasks=/tasks/v1 -mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations +mso.restapi.configurations=${mso.restapi.service.instance}/<service_instance_id>/configurations mso.restapi.configuration.instance=${mso.restapi.configurations}<configuration_id> mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id> |