From 66962852e3a62ea7b14f2ac2d5af53fe77177306 Mon Sep 17 00:00:00 2001 From: Wojciech Sliwka Date: Fri, 5 Oct 2018 09:20:32 +0200 Subject: Added missing prefix /onap/sp/infra was recently removed from svc.instance.path Change-Id: I69c2a7c2cb1005aefdcd3257427a76d88fb626c6 Issue-ID: VID-320 Signed-off-by: Wojciech Sliwka --- deliveries/src/main/docker/docker-files/Dockerfile | 2 +- .../webapp/WEB-INF/conf/system_template.properties | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile index ddaa8615..f37f81d8 100755 --- a/deliveries/src/main/docker/docker-files/Dockerfile +++ b/deliveries/src/main/docker/docker-files/Dockerfile @@ -29,7 +29,7 @@ ENV VID_AAI_HOST aai.api.simpledemo.onap.org ENV VID_AAI_PORT 8443 ENV VID_APP_DISPLAY_NAME VID ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context -ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080 +ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins ENV VID_MSO_USER InfraPortalClient ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz 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 60ef9a70..e6c939fb 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 @@ -103,17 +103,17 @@ mso.max.polls=10 mso.user.name=${VID_MSO_USER} mso.password.x=${VID_MSO_PASS} #E2E is v3 -mso.restapi.svc.e2einstance=/onap/so/infra/e2eServiceInstances/v3 +mso.restapi.svc.e2einstance=/e2eServiceInstances/v3 mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances -mso.restapi.vnf.instance=/onap/so/infra/serviceInstances/v6//vnfs -mso.restapi.vnf.changemanagement.instance=/onap/so/infra/serviceInstances/v6//vnfs// -mso.restapi.network.instance=/onap/so/infra/serviceInstances/v6//networks -mso.restapi.vf.module.scaleout=/onap/so/infra/serviceInstantiation/v7/serviceInstances//vnfs//vfModules/scaleOut -mso.restapi.vf.module.instance=/onap/so/infra//serviceInstances/v6//vnfs//vfModules -mso.restapi.volume.group.instance=/onap/so/infra/serviceInstances/v6//vnfs//volumeGroups -mso.restapi.get.orc.req=/onap/so/infra/orchestrationRequests/v6 -mso.restapi.get.orc.reqs=/onap/so/infra/orchestrationRequests/v6? +mso.restapi.vnf.instance=/serviceInstances/v6//vnfs +mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6//vnfs// +mso.restapi.network.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.volume.group.instance=/serviceInstances/v6//vnfs//volumeGroups +mso.restapi.get.orc.req=/orchestrationRequests/v6 +mso.restapi.get.orc.reqs=/orchestrationRequests/v6? mso.restapi.get.man.tasks=/tasks/v1 mso.restapi.configurations=/serviceInstances/v6//configurations mso.restapi.configuration.instance=${mso.restapi.configurations}/ -- cgit 1.2.3-korg