[MSO-8] Bring 1707 changes to MSO

Bring 1707 changes: restructure BPMN debug related configurations;
add configuration for workflow message adapter.

Change-Id: I95eb6cc52919e8fb9bef42550144d1805252f2fb
Signed-off-by: xg353y <xg353y@intl.att.com>

3 files changed, 12 insertions, 17 deletions

diff --git a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
index 7aecf5d..5831549 100644
--- a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
+++ b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
@@ -42,6 +42,9 @@ log.debug.DeleteServiceInstanceInfra=<%= @var["logDebugDeleteServiceInstanceInfr
 log.debug.CreateNetworkInstanceInfra=<%= @var["logDebugCreateNetworkInstanceInfra"] %>
 log.debug.DeleteNetworkInstanceInfra=<%= @var["logDebugDeleteNetworkInstanceInfra"] %>
 log.debug.UpdateNetworkInstanceInfra=<%= @var["logDebugUpdateNetworkInstanceInfra"] %>
+log.debug.UpdateNetworkInstance=<%= @var["logDebugUpdateNetworkInstance"] %>
+log.debug.DoUpdateNetworkInstance=<%= @var["logDebugDoUpdateNetworkInstance"] %>
+log.debug.DoUpdateNetworkInstanceRollback=<%= @var["logDebugDoUpdateNetworkInstanceRollback"] %>
 log.debug.CreateNetworkInstance=<%= @var["logDebugCreateNetworkInstance"] %>
 log.debug.DoCreateNetworkInstance=<%= @var["logDebugDoCreateNetworkInstance"] %>
 log.debug.DoCreateNetworkInstanceRollback=<%= @var["logDebugDoCreateNetworkInstanceRollback"] %>
@@ -64,11 +67,10 @@ log.debug.DoDeleteVfModuleVolumeV1=<%= @var["logDebugDoDeleteVfModuleVolumeV1"]
 log.debug.DoCreateVfModuleVolumeV1=<%= @var["logDebugDoCreateVfModuleVolumeV1"] %>
 log.debug.VPECreateVfModule=<%= @var["logDebugVPECreateVfModule"] %>
 log.debug.DHVCreateService=<%= @var["logDebugDHVCreateService"] %>
-log.debug.SNIROAdapter=<%= @var["logDebugSNIROAdapter"] %>
 log.debug.DHVActivateService=<%= @var["logDebugDHVActivateService"] %>
+log.debug.SNIROAdapter=<%= @var["logDebugSNIROAdapter"] %>
 mso.infra.customer.id=<%= @var["infraCustomerId"] %>
 mso.sniro.auth=<%= @var["sniroAuth"] %>
-mso.sniro.callback=<%= @var["sniroCallback"] %>
 mso.sniro.endpoint=<%= @var["sniroEndpoint"] %>
 mso.sniro.timeout=<%= @var["sniroTimeout"] %>
 mso.sniro.policies.dhv.2vvig=<%= @var["sniroPoliciesDHV2vvig"] %>
@@ -80,6 +82,7 @@ mso.adapters.db.endpoint=<%= @var["adaptersDbEndpoint"] %>
 mso.adapters.sdnc.endpoint=<%= @var["adaptersSdncEndpoint"] %>
 mso.adapters.sdnc.rest.endpoint=<%= @var["adaptersSdncRestEndpoint"] %>
 mso.adapters.tenant.endpoint=<%= @var["adaptersTenantEndpoint"] %>
+mso.adapters.workflow.message.endpoint=<%= @var["adaptersWorkflowMessageEndpoint"] %>
 mso.adapters.db.auth=<%= @var["adaptersDbAuth"] %>
 mso.workflow.message.endpoint=<%= @var["workflowMessageEndpoint"] %>
 mso.workflow.sdncadapter.callback=<%= @var["workflowSdncAdapterCallback"] %>
diff --git a/templates/default/mso-sdnc-adapter-config/mso.sdnc.properties b/templates/default/mso-sdnc-adapter-config/mso.sdnc.properties
index a37c2d6..ae66c0a 100755
--- a/templates/default/mso-sdnc-adapter-config/mso.sdnc.properties
+++ b/templates/default/mso-sdnc-adapter-config/mso.sdnc.properties
@@ -60,28 +60,13 @@ org.openecomp.mso.adapters.sdnc..network-topology-operation.rollback=POST|270000
 org.openecomp.mso.adapters.sdnc..network-topology-operation.delete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
 org.openecomp.mso.adapters.sdnc..network-topology-operation.changeassign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
 org.openecomp.mso.adapters.sdnc..network-topology-operation.changedelete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.prepare=POST|360000|sdncurl7|sdnc-request-header|org:openecomp:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.activate=POST|60000|sdncurl7|sdnc-request-header|org:openecomp:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.delete=POST|360000|sdncurl7|sdnc-request-header|org:openecomp:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.complete=POST|60000|sdncurl7|sdnc-request-header|org:openecomp:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.activatevnf=POST|60000|sdncurl7|sdnc-request-header|org:openecomp:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.designvnf=POST|60000|sdncurl7|sdnc-request-header|org:openecomp:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.removevnf=POST|60000|sdncurl7|sdnc-request-header|org:openecomp:sdnctl:l3ucpe
 org.openecomp.mso.adapters.sdnc..svc-topology-operation.assign=POST|285000|sdncurl8|sdnc-request-header|org:openecomp:sdnctl:nbncapi
 org.openecomp.mso.adapters.sdnc..svc-topology-operation.activate=POST|285000|sdncurl8|sdnc-request-header|org:openecomp:sdnctl:nbncapi
 org.openecomp.mso.adapters.sdnc..svc-topology-operation.delete=POST|285000|sdncurl8|sdnc-request-header|org:openecomp:sdnctl:nbncapi
 
-org.openecomp.mso.adapters.sdnc.service.ucpe.service-topology-assign-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe.service-topology-activate-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-stage-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-remove-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
 org.openecomp.mso.adapters.sdnc.service.dhv.service-topology-assign-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
 org.openecomp.mso.adapters.sdnc.service.infra.service-topology-infra-assign-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
 org.openecomp.mso.adapters.sdnc.service.infra.service-topology-infra-activate-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.adiod.service-topology-infra-assign-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.adiod.service-topology-infra-activate-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
 org.openecomp.mso.adapters.sdnc.service.vhnportal.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
 org.openecomp.mso.adapters.sdnc.service.vhnportal.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
 org.openecomp.mso.adapters.sdnc.service.vhngw.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1
diff --git a/templates/default/mso-workflow-message-adapter-config/mso.workflow-message-adapter.properties b/templates/default/mso-workflow-message-adapter-config/mso.workflow-message-adapter.properties
new file mode 100644
index 0000000..5d70ae1
--- /dev/null
+++ b/templates/default/mso-workflow-message-adapter-config/mso.workflow-message-adapter.properties
@@ -0,0 +1,7 @@
+# Workflow Adapter properties
+
+# BP notification endpoint that receives workflow messages
+org.openecomp.mso.adapters.workflow.message.bpelurl=<%= @var["wmbpelurl"] %>
+
+# Authorization for connecting to workflow.message.bpelurl
+org.openecomp.mso.adapters.workflow.message.bpelauth=<%= @var["wmbpelauth"] %>