From 5a4680ac8eacfba3d38186528fea35524d0011f1 Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Tue, 10 Sep 2019 14:50:26 +0300 Subject: [PATCH] update MSO configuration URL Issue-ID: VID-622 Signed-off-by: Eylon Malin Change-Id: I695a8822338fd1c8253b23b88ad260a43d02be9c --- epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties | 2 +- epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties | 2 +- .../src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java | 2 +- .../src/test/java/org/onap/vid/mso/rest/MsoRestClientNewTest.java | 2 +- vid-app-common/src/test/resources/WEB-INF/conf/system.properties | 2 +- .../presets/mso/configuration/PresetMSOActOnConfiguration.java | 2 +- .../presets/mso/configuration/PresetMSOCreateConfiguration.java | 2 +- .../presets/mso/configuration/PresetMSODeleteConfiguration.java | 2 +- .../presets/mso/configuration/PresetMsoEnableDisablePort.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties index 02daf651a..0e969976c 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties @@ -117,7 +117,7 @@ mso.restapi.get.orc.req=/orchestrationRequests/v7 mso.restapi.get.orc.reqs=/orchestrationRequests/v7? mso.restapi.resume.orc.req=/orchestrationRequests/v7//resume mso.restapi.get.man.tasks=/tasks/v1 -mso.restapi.configurations=/serviceInstances/v7//configurations +mso.restapi.configurations=${mso.restapi.service.instance}//configurations mso.restapi.configuration.instance=${mso.restapi.configurations}/ mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId= diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties index c4d9bf09e..272f4d061 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties @@ -117,7 +117,7 @@ mso.restapi.get.orc.req=/orchestrationRequests/v7 mso.restapi.get.orc.reqs=/orchestrationRequests/v7? mso.restapi.resume.orc.req=/orchestrationRequests/v7//resume mso.restapi.get.man.tasks=/tasks/v1 -mso.restapi.configurations=/serviceInstances/v7//configurations +mso.restapi.configurations=${mso.restapi.service.instance}//configurations mso.restapi.configuration.instance=${mso.restapi.configurations}/ mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId= 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//configurations/"; + String endpoint = "/serviceInstantiation/v7/serviceInstances//configurations/"; 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//resume mso.restapi.get.man.tasks=/tasks/v1 -mso.restapi.configurations=/serviceInstances/v6//configurations +mso.restapi.configurations=${mso.restapi.service.instance}//configurations mso.restapi.configuration.instance=${mso.restapi.configurations} mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId= diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java index 6c4b722d6..135438726 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java @@ -25,7 +25,7 @@ public class PresetMSOActOnConfiguration extends PresetMSOBaseCreateInstancePost @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/" + action; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/" + action; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java index 2a7e262a4..d5a4a402c 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java @@ -44,7 +44,7 @@ public class PresetMSOCreateConfiguration extends PresetMSOBaseCreateInstancePos @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v./" + this.serviceInstanceId + "/configurations"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + this.serviceInstanceId + "/configurations"; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java index 4d0582c91..5f61fe8f7 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java @@ -21,7 +21,7 @@ public class PresetMSODeleteConfiguration extends PresetMSOBaseCreateInstancePos @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113"; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java index db18e0104..fab96fc30 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java @@ -26,7 +26,7 @@ public class PresetMsoEnableDisablePort extends PresetMSOBaseCreateInstancePost @Override public String getReqPath() { - return "/mso/serviceInstances/v./"+serviceInstanceId+"/configurations/"+configurationId+"/" + action; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/"+serviceInstanceId+"/configurations/"+configurationId+"/" + action; } @Override -- 2.16.6