From ef75a6912e0d3851e45598e2c34be56d1e97039e Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Thu, 11 Apr 2019 18:31:16 +0200 Subject: removing /onap/so/infra from properties Change-Id: I9a42d8e3cf0e4fb17356645b7d894d279fe1501b Issue-ID: VID-460 Signed-off-by: Bartosz Gardziejewski --- 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 +- vid-app-common/src/test/resources/WEB-INF/conf/system.properties | 2 +- 4 files changed, 4 insertions(+), 4 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 a14aa49df..da1bfc46d 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 @@ -171,7 +171,7 @@ mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6//networks mso.restapi.vf.module.instance=/serviceInstances/v6//vnfs//vfModules mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances//vnfs//vfModules/scaleOut -mso.restapi.workflow.invoke=/onap/so/infra/instanceManagement/v1/serviceInstances//vnfs//workflows/ +mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances//vnfs//workflows/ mso.restapi.volume.group.instance=/serviceInstances/v6//vnfs//volumeGroups mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups mso.restapi.get.orc.req=/orchestrationRequests/v6 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 b7b8f93d8..345d041b0 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 @@ -114,7 +114,7 @@ mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6//networks mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances//vnfs//vfModules/scaleOut mso.restapi.vf.module.instance=/serviceInstances/v6//vnfs//vfModules -mso.restapi.workflow.invoke=/onap/so/infra/instanceManagement/v1/serviceInstances//vnfs//workflows/ +mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances//vnfs//workflows/ mso.restapi.volume.group.instance=/serviceInstances/v6//vnfs//volumeGroups mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups mso.restapi.get.orc.req=/orchestrationRequests/v6 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 4494f4872..f54756e76 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 @@ -1353,7 +1353,7 @@ public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests { UUID serviceInstanceId = new UUID(1,10); UUID vnfInstanceId = new UUID(2,20); UUID workflow_UUID = new UUID(3,30); - String path = "/onap/so/infra/instanceManagement/v1/serviceInstances/"+serviceInstanceId+"/vnfs/"+vnfInstanceId+"/workflows/"+workflow_UUID; + String path = "/instanceManagement/v1/serviceInstances/"+serviceInstanceId+"/vnfs/"+vnfInstanceId+"/workflows/"+workflow_UUID; given(msoInterface.invokeWorkflow(eq(request), eq(path), MockitoHamcrest.argThat(allOf(hasEntry("X-RequestorID", "testRequester"),hasEntry("X-ONAP-PartnerName", "VID"))))).willReturn(okResponse); 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 a0f0dbe19..9cb5208da 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 @@ -152,7 +152,7 @@ mso.restapi.vnf.changemanagement.instance=/serviceInstances/v5//networks mso.restapi.vf.module.instance=/serviceInstances/v7//vnfs//vfModules mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances//vnfs//vfModules/scaleOut -mso.restapi.workflow.invoke=/onap/so/infra/instanceManagement/v1/serviceInstances//vnfs//workflows/ +mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances//vnfs//workflows/ mso.restapi.volume.group.instance=/serviceInstances/v5//vnfs//volumeGroups mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups mso.restapi.get.orc.req=/orchestrationRequests/v5 -- cgit 1.2.3-korg