summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmichai Hemli <ah0398@intl.att.com>2017-09-17 14:33:09 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-17 14:33:09 +0000
commitc3722d135481cfab5978c84853d8229d1e7d9cb3 (patch)
treea7ec07fb7695fc8edede191f0e375f2626eb5e6d
parent42b29c4e64ac448441780e6e03ce9e19ad55c012 (diff)
parent2c7338c6729486408842bcdc51143de327a5f349 (diff)
Merge "Pointed to SO API v4"
-rwxr-xr-xepsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties14
-rwxr-xr-xepsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties14
2 files changed, 14 insertions, 14 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 b376b20e..e7623665 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
@@ -158,13 +158,13 @@ mso.polling.interval.msecs=2000
mso.max.polls=3
mso.user.name=infraportal
mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
-mso.restapi.svc.instance=/serviceInstances/v3
-mso.restapi.vnf.instance=/serviceInstances/v3/<service_instance_id>/vnfs
-mso.restapi.network.instance=/serviceInstances/v3/<service_instance_id>/networks
-mso.restapi.vf.module.instance=/serviceInstances/v3/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
-mso.restapi.volume.group.instance=/serviceInstances/v3/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
-mso.restapi.get.orc.req=/orchestrationRequests/v3
-mso.restapi.get.orc.reqs=/orchestrationRequests/v3?
+mso.restapi.svc.instance=/serviceInstances/v4
+mso.restapi.vnf.instance=/serviceInstances/v4/<service_instance_id>/vnfs
+mso.restapi.network.instance=/serviceInstances/v4/<service_instance_id>/networks
+mso.restapi.vf.module.instance=/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
+mso.restapi.volume.group.instance=/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.get.orc.req=/orchestrationRequests/v4
+mso.restapi.get.orc.reqs=/orchestrationRequests/v4?
vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks
mso.dme2.client.timeout=30000
mso.dme2.client.read.timeout=120000
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 1b7921c7..a872ef2d 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
@@ -101,13 +101,13 @@ mso.polling.interval.msecs=${MSO_POLLING_INTERVAL_MSECS}
mso.max.polls=10
mso.user.name=${VID_MSO_USER}
mso.password.x=${VID_MSO_PASS}
-mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v2
-mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v2/<service_instance_id>/vnfs
-mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v2/<service_instance_id>/networks
-mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v2/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
-mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v2/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
-mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v2
-mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v2?
+mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v4
+mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs
+mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/networks
+mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
+mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v4
+mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v4?
vid.truststore.filename=${VID_TRUSTSTORE_FILE}
vid.truststore.passwd.x=${VID_TRUSTSTORE_PASS}
mso.dme2.client.timeout=${MSO_DME2_CLIENT_TIMEOUT}