Merge "align logic to new so api"

diff --combined epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index 6def047,9310da0..a14aa49
--- 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
@@@ -107,8 -107,6 +107,8 @@@ decryption_key                               = AGLDdG4D04BKm2IxI
  element_map_file_path = app/fusionapp/files/
  element_map_icon_path = app/fusionapp/icons/
  
 +role_management_activated = false
 +
  #aai related properties
  #aai.server.url.base=https://aai.api.openecomp.org:8443/aai/
  #aai.server.url=https://aai.api.openecomp.org:8443/aai/v8/
@@@ -193,7 -191,7 +193,7 @@@ mso.restapi.operationalEnvironment.crea
  
  mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1
  mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId=<request_id>
- 
+ mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
  mso.displayTestAPIOnScreen=true
  mso.defaultTestAPI=GR_API
  mso.maxOpenedInstantiationRequests=20

diff --combined epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
index 2d1ad7d,f5955a5..b7b8f93
--- 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
@@@ -64,8 -64,6 +64,8 @@@ decryption_key = ${VID_DECRYPTION_KEY
  element_map_file_path = /tmp
  element_map_icon_path = app/vid/icons/
  
 +role_management_activated = false
 +
  #aai related properties
  aai.server.url.base=${VID_AAI_URL}/aai/
  aai.server.url=${VID_AAI_URL}/aai/v13/
@@@ -122,7 -120,7 +122,7 @@@ mso.restapi.get.orc.reqs=/orchestration
  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.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
  mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7
  mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
  mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign

diff --combined vid-app-common/src/test/resources/WEB-INF/conf/system.properties
index 422514b,fce0d1a..a0f0dbe
--- 1/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
--- 2/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
+++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
@@@ -71,8 -71,6 +71,8 @@@ application_name              = Virtua
  element_map_file_path = app/fusionapp/files/
  element_map_icon_path = app/fusionapp/icons/
  
 +role_management_activated = false
 +
  #aai related properties
  #dev server
  #ist servers
@@@ -172,6 -170,7 +172,7 @@@ mso.restapi.operationalEnvironment.crea
  mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7
  mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
  mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign
+ mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
  
  vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks
  mso.dme2.client.timeout=30000