Merge "Turn role management off by default"

diff --combined epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index 431306d,eaaf019..6def047
--- 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,6 -107,8 +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/
@@@ -169,7 -171,6 +171,7 @@@ mso.restapi.vnf.changemanagement.instan
  mso.restapi.network.instance=/serviceInstances/v6/<service_instance_id>/networks
  mso.restapi.vf.module.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
  mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
 +mso.restapi.workflow.invoke=/onap/so/infra/instanceManagement/v1/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/workflows/<workflow_UUID>
  mso.restapi.volume.group.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
  mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups
  mso.restapi.get.orc.req=/orchestrationRequests/v6
@@@ -207,4 -208,4 +209,4 @@@ scheduler.get.time.slots=/v1/ChangeMana
  scheduler.server.url=http://BYO.scheduler:8989/scheduler
  
  scheduler.submit.new.vnf.change=/v1/ChangeManagement/schedules/{scheduleId}/approvals
- scheduler.get.schedules=/v1/ChangeManagement/schedules/scheduleDetails/
+ scheduler.get.schedules=/v1/ChangeManagement/schedules/scheduleDetails/

diff --combined epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
index ac8c393,9ab9d77..2d1ad7d
--- 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,6 -64,8 +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/
@@@ -112,7 -114,6 +114,7 @@@ mso.restapi.vnf.changemanagement.instan
  mso.restapi.network.instance=/serviceInstances/v6/<service_instance_id>/networks
  mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
  mso.restapi.vf.module.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
 +mso.restapi.workflow.invoke=/onap/so/infra/instanceManagement/v1/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/workflows/<workflow_UUID>
  mso.restapi.volume.group.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
  mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups
  mso.restapi.get.orc.req=/orchestrationRequests/v6

diff --combined vid-app-common/src/test/resources/WEB-INF/conf/system.properties
index 71f8eac,208155b..422514b
--- 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,6 -71,8 +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
@@@ -150,7 -152,6 +152,7 @@@ mso.restapi.vnf.changemanagement.instan
  mso.restapi.network.instance=/serviceInstances/v5/<service_instance_id>/networks
  mso.restapi.vf.module.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
  mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
 +mso.restapi.workflow.invoke=/onap/so/infra/instanceManagement/v1/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/workflows/<workflow_UUID>
  mso.restapi.volume.group.instance=/serviceInstances/v5/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
  mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups
  mso.restapi.get.orc.req=/orchestrationRequests/v5