Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

2 files changed, 49 insertions, 0 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 defbff9f..035d3d8f 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
@@ -162,6 +162,7 @@ mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
 #E2E is v3

 mso.restapi.svc.e2einstance=/e2eServiceInstances/v3

 mso.restapi.svc.instance=/serviceInstances/v6

+mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances

 mso.restapi.vnf.instance=/serviceInstances/v6/<service_instance_id>/vnfs

 mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>

 mso.restapi.network.instance=/serviceInstances/v6/<service_instance_id>/networks

@@ -170,6 +171,29 @@ mso.restapi.volume.group.instance=/serviceInstances/v6/<service_instance_id>/vnf
 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/<service_instance_id>/configurations

+mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>

+

+mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7

+mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances

+mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign

+

+mso.restapi.cloudResourcesApiRoot=/cloudResources/v1

+mso.restapi.operationalEnvironment=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments/<operational_environment_id>

+

+mso.restapi.operationalEnvironment.activate=${mso.restapi.operationalEnvironment}/activate

+mso.restapi.operationalEnvironment.deactivate=${mso.restapi.operationalEnvironment}/deactivate

+mso.restapi.operationalEnvironment.create=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments

+

+mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1

+mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId=<request_id>

+

+mso.displayTestAPIOnScreen=true

+mso.defaultTestAPI=GR_API

+mso.maxOpenedInstantiationRequests=20

+mso.asyncPollingIntervalSeconds=1

+refreshTimeInstantiationDashboard=10

+

 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 07319630..2ca038a5 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
@@ -105,6 +105,7 @@ mso.password.x=${VID_MSO_PASS}
 #E2E is v3

 mso.restapi.svc.e2einstance=/ecomp/mso/infra/e2eServiceInstances/v3

 mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v6

+mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances

 mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs

 mso.restapi.vnf.changemanagement.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>

 mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/networks

@@ -112,6 +113,30 @@ mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v6/<service_ins
 mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups

 mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v6

 mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v6?

+mso.restapi.get.man.tasks=/tasks/v1

+mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations

+mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>

+

+mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7

+mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances

+mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign

+

+mso.restapi.cloudResourcesApiRoot=/cloudResources/v1

+mso.restapi.operationalEnvironment=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments/<operational_environment_id>

+

+mso.restapi.operationalEnvironment.activate=${mso.restapi.operationalEnvironment}/activate

+mso.restapi.operationalEnvironment.deactivate=${mso.restapi.operationalEnvironment}/deactivate

+mso.restapi.operationalEnvironment.create=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments

+

+mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1

+mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId=<request_id>

+

+mso.displayTestAPIOnScreen=true

+mso.defaultTestAPI=GR_API

+mso.maxOpenedInstantiationRequests=20

+mso.asyncPollingIntervalSeconds=1

+refreshTimeInstantiationDashboard=10

+

 vid.truststore.filename=${VID_TRUSTSTORE_FILE}

 vid.truststore.passwd.x=${VID_TRUSTSTORE_PASS}

 mso.dme2.client.timeout=${MSO_DME2_CLIENT_TIMEOUT}