Merge "Fix service instantiation error"

diff --combined epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index 8834379,266ca96..049ebf0
--- 1/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
--- 2/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
@@@ -161,12 -161,13 +161,13 @@@ mso.user.name=infraporta
  mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz\r
  #E2E is v3\r
  mso.restapi.svc.e2einstance=/e2eServiceInstances/v3\r
 -mso.restapi.svc.instance=/serviceInstances/v6\r
 +mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances\r
  mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances\r
  mso.restapi.vnf.instance=/serviceInstances/v6/<service_instance_id>/vnfs\r
  mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>\r
  mso.restapi.network.instance=/serviceInstances/v6/<service_instance_id>/networks\r
- mso.restapi.vf.module.instance=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut\r
+ mso.restapi.vf.module.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules\r
+ mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut\r
  mso.restapi.volume.group.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups\r
  mso.restapi.get.orc.req=/orchestrationRequests/v6\r
  mso.restapi.get.orc.reqs=/orchestrationRequests/v6?\r

diff --combined epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
index c79ae96,29d2f0b..60ef9a7
--- 1/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
--- 2/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
@@@ -104,12 -104,13 +104,13 @@@ mso.user.name=${VID_MSO_USER
  mso.password.x=${VID_MSO_PASS}\r
  #E2E is v3\r
  mso.restapi.svc.e2einstance=/onap/so/infra/e2eServiceInstances/v3\r
 -mso.restapi.svc.instance=/onap/so/infra/serviceInstances/v6\r
 +mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances\r
  mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances\r
  mso.restapi.vnf.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs\r
  mso.restapi.vnf.changemanagement.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>\r
  mso.restapi.network.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/networks\r
- mso.restapi.vf.module.instance=/onap/so/infra/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut\r
+ mso.restapi.vf.module.scaleout=/onap/so/infra/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut\r
+ mso.restapi.vf.module.instance=/onap/so/infra//serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules\r
  mso.restapi.volume.group.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups\r
  mso.restapi.get.orc.req=/onap/so/infra/orchestrationRequests/v6\r
  mso.restapi.get.orc.reqs=/onap/so/infra/orchestrationRequests/v6?\r