[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>

7 files changed, 215 insertions, 127 deletions

diff --git a/attributes/default.rb b/attributes/default.rb
index 7766e8f..2f42e69 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -6,7 +6,6 @@ node.default['mso_config_path'] = '/opt/mso/etc/ecomp/mso/config'
 ######################
 # AFT
 ##########
-#https://wiki.web.att.com/pages/viewpage.action?pageId=85196962
 node.default["aft"]["latitude"] = ""
 node.default["aft"]["longitude"] = ""
 node.default["aft"]["environment"] = "" # AFTUAT || AFTPRD
@@ -34,6 +33,7 @@ node.default["mso-api-handler-infra-config"]["volume.v3.ApiAllowableActions"] =
 ##########
 node.default["mso-sdnc-adapter-config"]["sdncurls"] = []
 node.default["mso-sdnc-adapter-config"]["bpelurl"] = "DefaultRecipe_bpelurl"
+node.default["mso-sdnc-adapter-config"]["restbpelurl"] = "DefaultRecipe_restbpelurl"
 node.default["mso-sdnc-adapter-config"]["myurl"] = "DefaultRecipe_myurl"
 node.default["mso-sdnc-adapter-config"]["sdncauth"] = "DefaultRecipe_sdncauth"
 node.default["mso-sdnc-adapter-config"]["bpelauth"] = "DefaultRecipe_bpelauth"
@@ -111,114 +111,6 @@ node.default["mso-po-adapter-config"]["tenant"]["org.openecomp.mso.adapters.tena
 node.default["mso-po-adapter-config"]["tenant"]["org.openecomp.mso.adapters.tenant.set_default_quota"] = "false"
 node.default["mso-po-adapter-config"]["tenant"]["org.openecomp.mso.adapters.tenant.default_quota_value"] = "10"
 
-######################
-# BPMN
-##########
-node.default["mso-bpmn-config"]["urnFileSystemLoadingEnabled"] = "true"
-node.default["mso-bpmn-urn-config"]["logDebugAsyncQueryAAICustomer"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugChangeFeatureActivateV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugChangeLayer3ServiceActivateV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugChangeLayer3ServiceProvV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCompleteMsoProcess"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCommonCompletion"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateCustomerV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateTenantV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteTenantV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteVCEV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugGetLayer3ServiceDetailsV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugL3ToHigherLayerAddBonding"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugL3ToHigherLayerDeleteBonding"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugLayer3ServiceActivateV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugQueryAAICustomer"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugQueryTenantInfo"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugSdncAdapter"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugSendAOTSTicket"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugVnfAdapterCreateV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugVnfAdapterDeleteV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugRemoveLayer3Service"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugLayer3TestAndTurnUpV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugVnfAdapterRollbackV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugVnfAdapterQueryV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateVfModuleVolume"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteVfModuleVolume"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugUpdateVfModuleVolume"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateCinderVolumeV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteCinderVolumeV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugUpdateCinderVolumeV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateNetworkV2"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteNetworkV2"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugUpdateNetworkV2"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteGenericVNFV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDisconnectLayer3Service"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateVfModuleVolumeInfraV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteVfModuleVolumeInfraV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugUpdateVfModuleVolumeInfraV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateServiceInstanceInfra"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteServiceInstanceInfra"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateNetworkInstanceInfra"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteNetworkInstanceInfra"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugUpdateNetworkInstanceInfra"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateNetworkInstance"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoCreateNetworkInstance"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoCreateNetworkInstanceRollback"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteNetworkInstance"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoDeleteNetworkInstance"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoDeleteNetworkInstanceRollback"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateViprAtmService"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDeleteViprAtmService"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugGenericGetService"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugGenericPutService"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugGenericDeleteService"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugCreateServiceInstance"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDelServiceInstance"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugRollbackServiceInstance"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoCreateServiceInstanceRollback"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoDeleteServiceInstance"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoCreateVfModuleVolumeRollback"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoDeleteVfModuleVolumeRollback"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoDeleteVfModuleVolumeV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDoCreateVfModuleVolumeV1"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugVPECreateVfModule"] = "false"
-node.default["mso-bpmn-urn-config"]["logDebugDHVCreateService"] = "DefaultRecipe_logDebugDHVCreateService"
-node.default["mso-bpmn-urn-config"]["logDebugSNIROAdapter"] = "DefaultRecipe_logDebugSNIROAdapter"
-node.default["mso-bpmn-urn-config"]["logDebugDHVActivateService"] = "false"
-node.default["mso-bpmn-urn-config"]["infraCustomerId"] = "DefaultRecipe_infraCustomerId"
-node.default["mso-bpmn-urn-config"]["sniroAuth"] = "test:testpwd"
-node.default["mso-bpmn-urn-config"]["sniroCallback"] = "DefaultRecipe_sniroCallback"
-node.default["mso-bpmn-urn-config"]["sniroEndpoint"] = "DefaultRecipe_sniroEndpoint"
-node.default["mso-bpmn-urn-config"]["sniroTimeout"] = "DefaultRecipe_sniroTimeout"
-node.default["mso-bpmn-urn-config"]["sniroPoliciesDHV2vvig"] = "DefaultRecipe_sniroPoliciesDHV2vvig"
-node.default["mso-bpmn-urn-config"]["sniroPoliciesDHV4vvig"] = "DefaultRecipe_sniroPoliciesDHV4vvig"
-node.default["mso-bpmn-urn-config"]["catalogDbEndpoint"] = "DefaultRecipe_catalogDbEndpoint"
-node.default["mso-bpmn-urn-config"]["aaiEndpoint"] = "DefaultRecipe_sdncauth"
-node.default["mso-bpmn-urn-config"]["adaptersCompletemsoprocessEndpoint"] = "DefaultRecipe_sdncconnecttime"
-node.default["mso-bpmn-urn-config"]["adaptersDbEndpoint"] = "DefaultRecipe_adaptersDbEndpoint"
-node.default["mso-bpmn-urn-config"]["adaptersSdncEndpoint"] = "DefaultRecipe_adaptersSdncEndpoint"
-node.default["mso-bpmn-urn-config"]["adaptersSdncRestEndpoint"] = "DefaultRecipe_adaptersSdncRestEndpoint"
-node.default["mso-bpmn-urn-config"]["adaptersTenantEndpoint"] = "DefaultRecipe_adaptersTenantEndpoint"
-node.default["mso-bpmn-urn-config"]["workflowMessageEndpoint"] = "DefaultRecipe_workflowMessageEndpoint"
-node.default["mso-bpmn-urn-config"]["workflowSdncAdapterCallback"] = "DefaultRecipe_workflowSdncAdapterCallback"
-node.default["mso-bpmn-urn-config"]["msoKey"] = "DefaultRecipe_msoKey"
-node.default["mso-bpmn-urn-config"]["sdncPassword"] = "DefaultRecipe_sdncPassword"
-node.default["mso-bpmn-urn-config"]["adaptersPoAuth"] = "DefaultRecipe_adaptersPoAuth"
-node.default["mso-bpmn-urn-config"]["sdncTimeout"] = "DefaultRecipe_sdncTimeout"
-node.default["mso-bpmn-urn-config"]["rollback"] = "DefaultRecipe_rollback"
-node.default["mso-bpmn-urn-config"]["adaptersNetworkEndpoint"] = "DefaultRecipe_adaptersNetworkEndpoint"
-node.default["mso-bpmn-urn-config"]["adaptersNetworkRestEndpoint"] = "DefaultRecipe_adaptersNetworkRestEndpoint"
-node.default["mso-bpmn-urn-config"]["adaptersVnfAsyncEndpoint"] = "DefaultRecipe_adaptersVnfAsyncEndpoint"
-node.default["mso-bpmn-urn-config"]["workflowVnfAdapterDeleteCallback"] = "DefaultRecipe_workflowVnfAdapterDeleteCallback"
-node.default["mso-bpmn-urn-config"]["workflowVnfAdapterCreateCallback"] = "DefaultRecipe_workflowVnfAdapterCreateCallback"
-node.default["mso-bpmn-urn-config"]["adaptersVnfRestEndpoint"] = "DefaultRecipe_adaptersVnfRestEndpoint"
-node.default["mso-bpmn-urn-config"]["adaptersPoPassword"] = "DefaultRecipe_adaptersPoPassword"
-node.default["mso-bpmn-urn-config"]["poTimeout"] = "DefaultRecipe_poTimeout"
-node.default["mso-bpmn-urn-config"]["sdncFirewallYangModel"] = "DefaultRecipe_sdncFirewallYangModel"
-node.default["mso-bpmn-urn-config"]["sdncFirewallYangModelVersion"] = "DefaultRecipe_sdncFirewallYangModelVersion"
-node.default["mso-bpmn-urn-config"]["sdncTimeoutFirewall"] = "DefaultRecipe_sdncTimeoutFirewall"
-node.default["mso-bpmn-urn-config"]["callbackRetryAttempts"] = "30"
-node.default["mso-bpmn-urn-config"]["callbackRetrySleepTime"] = "1000"
-node.default["mso-bpmn-urn-config"]["useQualifiedHost"] = "false"
-node.default["mso-bpmn-urn-config"]["workflowL3ToHigherLayerAddBondingModelName"] = "WAN Bonding v0.1"
-node.default["mso-bpmn-urn-config"]["workflowL3ToHigherLayerAddBondingModelVersion"] = "0.1"
 
 ##################################################################
 # To specify the default A&AI version to use for all resources:
@@ -272,3 +164,9 @@ node.default["mso-appc-adapter-config"]["bpel_url"] = "DefaultRecipe"
 node.default["mso-appc-adapter-config"]["bpel_stub"] = "DefaultRecipe"
 node.default["mso-appc-adapter-config"]["bpel_auth"] = "DefaultRecipe"
 node.default["mso-appc-adapter-config"]["bpel_timeout"] = "DefaultRecipe"
+
+######################
+# workflow message adapter
+##########
+node.default["mso-workflow-message-adapter-config"]["wmbpelurl"] = "DefaultRecipe_wmbpelurl"
+node.default["mso-workflow-message-adapter-config"]["wmbpelauth"] = "DefaultRecipe_wmbpelauth"
diff --git a/attributes/mso-bpmn-urn-config.rb b/attributes/mso-bpmn-urn-config.rb
new file mode 100644
index 0000000..d0b34dc
--- /dev/null
+++ b/attributes/mso-bpmn-urn-config.rb
@@ -0,0 +1,157 @@
+######################
+# BPMN
+##########
+node.default["mso-bpmn-config"]["urnFileSystemLoadingEnabled"] = "true"
+
+####
+node.default["mso-bpmn-urn-config"]["infraCustomerId"] = "DefaultRecipe_infraCustomerId"
+node.default["mso-bpmn-urn-config"]["sniroAuth"] = "DefaultRecipe_sniroAuth"
+node.default["mso-bpmn-urn-config"]["sniroCallback"] = "DefaultRecipe_sniroCallback"
+node.default["mso-bpmn-urn-config"]["sniroEndpoint"] = "DefaultRecipe_sniroEndpoint"
+node.default["mso-bpmn-urn-config"]["sniroTimeout"] = "DefaultRecipe_sniroTimeout"
+node.default["mso-bpmn-urn-config"]["sniroPoliciesDHV2vvig"] = "DefaultRecipe_sniroPoliciesDHV2vvig"
+node.default["mso-bpmn-urn-config"]["sniroPoliciesDHV4vvig"] = "DefaultRecipe_sniroPoliciesDHV4vvig"
+node.default["mso-bpmn-urn-config"]["catalogDbEndpoint"] = "DefaultRecipe_catalogDbEndpoint"
+node.default["mso-bpmn-urn-config"]["aaiEndpoint"] = "DefaultRecipe_sdncauth"
+node.default["mso-bpmn-urn-config"]["csiNetworkstatusEndpoint"] = "DefaultRecipe_bpelauth"
+node.default["mso-bpmn-urn-config"]["adaptersCompletemsoprocessEndpoint"] = "DefaultRecipe_sdncconnecttime"
+node.default["mso-bpmn-urn-config"]["adaptersDbEndpoint"] = "DefaultRecipe_adaptersDbEndpoint"
+node.default["mso-bpmn-urn-config"]["adaptersSdncEndpoint"] = "DefaultRecipe_adaptersSdncEndpoint"
+node.default["mso-bpmn-urn-config"]["adaptersSdncRestEndpoint"] = "DefaultRecipe_adaptersSdncRestEndpoint"
+node.default["mso-bpmn-urn-config"]["adaptersTenantEndpoint"] = "DefaultRecipe_adaptersTenantEndpoint"
+node.default["mso-bpmn-urn-config"]["workflowMessageEndpoint"] = "DefaultRecipe_workflowMessageEndpoint"
+node.default["mso-bpmn-urn-config"]["workflowSdncAdapterCallback"] = "DefaultRecipe_workflowSdncAdapterCallback"
+node.default["mso-bpmn-urn-config"]["csiPwd"] = "DefaultRecipe_csiPwd"
+node.default["mso-bpmn-urn-config"]["csiUsername"] = "DefaultRecipe_csiUsername"
+node.default["mso-bpmn-urn-config"]["msoKey"] = "DefaultRecipe_msoKey"
+node.default["mso-bpmn-urn-config"]["sdncPassword"] = "DefaultRecipe_sdncPassword"
+node.default["mso-bpmn-urn-config"]["adaptersPoAuth"] = "DefaultRecipe_adaptersPoAuth"
+node.default["mso-bpmn-urn-config"]["sdncTimeout"] = "DefaultRecipe_sdncTimeout"
+node.default["mso-bpmn-urn-config"]["rollback"] = "DefaultRecipe_rollback"
+node.default["mso-bpmn-urn-config"]["adaptersNetworkEndpoint"] = "DefaultRecipe_adaptersNetworkEndpoint"
+node.default["mso-bpmn-urn-config"]["adaptersNetworkRestEndpoint"] = "DefaultRecipe_adaptersNetworkRestEndpoint"
+node.default["mso-bpmn-urn-config"]["adaptersVnfAsyncEndpoint"] = "DefaultRecipe_adaptersVnfAsyncEndpoint"
+node.default["mso-bpmn-urn-config"]["workflowVnfAdapterDeleteCallback"] = "DefaultRecipe_workflowVnfAdapterDeleteCallback"
+node.default["mso-bpmn-urn-config"]["workflowVnfAdapterCreateCallback"] = "DefaultRecipe_workflowVnfAdapterCreateCallback"
+node.default["mso-bpmn-urn-config"]["adaptersVnfRestEndpoint"] = "DefaultRecipe_adaptersVnfRestEndpoint"
+node.default["mso-bpmn-urn-config"]["adaptersPoPassword"] = "DefaultRecipe_adaptersPoPassword"
+node.default["mso-bpmn-urn-config"]["poTimeout"] = "DefaultRecipe_poTimeout"
+node.default["mso-bpmn-urn-config"]["sdncFirewallYangModel"] = "DefaultRecipe_sdncFirewallYangModel"
+node.default["mso-bpmn-urn-config"]["sdncFirewallYangModelVersion"] = "DefaultRecipe_sdncFirewallYangModelVersion"
+node.default["mso-bpmn-urn-config"]["sdncTimeoutFirewall"] = "DefaultRecipe_sdncTimeoutFirewall"
+node.default["mso-bpmn-urn-config"]["callbackRetryAttempts"] = "30"
+node.default["mso-bpmn-urn-config"]["callbackRetrySleepTime"] = "1000"
+node.default["mso-bpmn-urn-config"]["useQualifiedHost"] = "false"
+node.default["mso-bpmn-urn-config"]["csiAotsAddincidentmanagement"] = "DefaultRecipe_csiAotsAddincidentmanagement"
+node.default["mso-bpmn-urn-config"]["canopiAuth"] = "DefaultRecipe_canopiAuth"
+node.default["mso-bpmn-urn-config"]["workflowL3ToHigherLayerAddBondingModelName"] = "WAN Bonding v0.1"
+node.default["mso-bpmn-urn-config"]["workflowL3ToHigherLayerAddBondingModelVersion"] = "0.1"
+
+##################################################################
+# To specify the default A&AI version to use for all resources:
+#    Use: workflowGlobalDefaultAAIVersion ------------------- Example: node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "8"
+# To override the default A&AI version:
+#    Resource-specific: workflowDefaultAAI{Resource}Version - Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIGenericVnfUriVersion"] = "7"
+#    Flow-specific: workflowCustom{SpecificFlow}AAIVersion -- Example: node.default["mso-bpmn-urn-config"]["workflowCustomCreateNetworkV1AAIVersion"] = "6"
+# To specify a version+resource URI:
+#    Use format: workflowDefaultAAI{Version}{Resource}Uri --- Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8GenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf"
+# To override URI for a specific flow+resource:
+#    Use format: workflow{SpecificFlow}{Resource}Uri -------- Example: node.default["mso-bpmn-urn-config"]["workflowCreateNetworkV1GenericVnfUri"] = "/aai/v9/network/generic-vnfs/generic-vnf"
+#
+# Lookup order (precedence): flow+resource specific (1st) -> flow-specific version -> resource-specific version -> default version (last)
+########################################################################################################################################################################################################
+node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "8"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8GenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8VpnBindingUri"] = "/aai/v8/network/vpn-bindings/vpn-binding"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8VceUri"] = "/aai/v8/network/vces/vce"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8L3NetworkUri"] = "/aai/v8/network/l3-networks/l3-network"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8CustomerUri"] = "/aai/v8/business/customers/customer"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8NetworkPolicyUri"] = "/aai/v8/network/network-policies/network-policy"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8RouteTableReferenceUri"] = "/aai/v8/network/route-table-references/route-table-reference"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8TenantUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8GenericQueryUri"] = "/aai/v8/search/generic-query"
+#note the CloudRegionURI is used for volume-groups
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8CloudRegionUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8NodesQueryUri"] = "/aai/v8/search/nodes-query"
+#Override A&AI version for generic-vnf and cloud-region (for volume-groups)
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIGenericVnfUriVersion"] = "9"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV9GenericVnfUri"] = "/aai/v9/network/generic-vnfs/generic-vnf"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAICloudRegionUriVersion"] = "9"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV9CloudRegionUri"] = "/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic"
+node.default["mso-bpmn-urn-config"]["workflowDHVCreateServiceAAICustomerUri"] = "/aai/v9/business/customers/customer"
+
+
+
+##########
+# DEBUG defaults
+node.default["mso-bpmn-config"]["debug"] = "false"
+###
+node.default["mso-bpmn-urn-config"]["logDebugAsyncQueryAAICustomer"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugChangeFeatureActivateV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugChangeLayer3ServiceActivateV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugChangeLayer3ServiceProvV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCompleteMsoProcess"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCommonCompletion"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateCustomerV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateTenantV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteTenantV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteVCEV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugGetLayer3ServiceDetailsV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugL3ToHigherLayerAddBonding"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugL3ToHigherLayerDeleteBonding"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugLayer3ServiceActivateV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugQueryAAICustomer"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugQueryTenantInfo"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugSdncAdapter"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugSendAOTSTicket"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugVnfAdapterCreateV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugVnfAdapterDeleteV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugRemoveLayer3Service"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugLayer3TestAndTurnUpV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugVnfAdapterRollbackV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugVnfAdapterQueryV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateVfModuleVolume"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteVfModuleVolume"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugUpdateVfModuleVolume"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateCinderVolumeV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteCinderVolumeV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugUpdateCinderVolumeV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateNetworkV2"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteNetworkV2"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugUpdateNetworkV2"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteGenericVNFV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDisconnectLayer3Service"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateVfModuleVolumeInfraV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteVfModuleVolumeInfraV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugUpdateVfModuleVolumeInfraV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateServiceInstanceInfra"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteServiceInstanceInfra"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateNetworkInstanceInfra"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteNetworkInstanceInfra"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugUpdateNetworkInstanceInfra"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugUpdateNetworkInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoUpdateNetworkInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoUpdateNetworkInstanceRollback"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateNetworkInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoCreateNetworkInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoCreateNetworkInstanceRollback"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteNetworkInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoDeleteNetworkInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoDeleteNetworkInstanceRollback"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateViprAtmService"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDeleteViprAtmService"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugGenericGetService"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugGenericPutService"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugGenericDeleteService"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugCreateServiceInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDelServiceInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugRollbackServiceInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoCreateServiceInstanceRollback"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoDeleteServiceInstance"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoCreateVfModuleVolumeRollback"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoDeleteVfModuleVolumeRollback"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoDeleteVfModuleVolumeV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDoCreateVfModuleVolumeV1"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugVPECreateVfModule"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDHVCreateService"] = node["mso-bpmn-urn-config"]["debug"]
+node.default["mso-bpmn-urn-config"]["logDebugDHVActivateService"] = node["mso-bpmn-urn-config"]["debug"]
diff --git a/recipes/jra.rb b/recipes/jra.rb
index da46ee2..2822542 100644
--- a/recipes/jra.rb
+++ b/recipes/jra.rb
@@ -1,9 +1,10 @@
 ################
 # Deploy jra config set
-# 
+#
 ######
 include_recipe "mso-config::mso-sdnc-adapter-config"
 include_recipe "mso-config::mso-po-adapter-config"
 include_recipe "mso-config::mso-topology-config"
 include_recipe "mso-config::mso-appc-adapter-config"
+include_recipe "mso-config::mso-workflow-message-adapter-config"
 
diff --git a/recipes/mso-workflow-message-adapter-config.rb b/recipes/mso-workflow-message-adapter-config.rb
new file mode 100644
index 0000000..69732c8
--- /dev/null
+++ b/recipes/mso-workflow-message-adapter-config.rb
@@ -0,0 +1,37 @@
+################
+#
+######
+include_recipe 'mso-config::createConfigDirectories'
+
+################
+#
+######
+['mso.workflow-message-adapter.properties'].each do |file|
+  template "#{node['mso_config_path']}#{file}" do
+    source "mso-workflow-message-adapter-config/#{file}"
+    owner "jboss"
+    group "jboss"
+    mode "0744"
+    variables(
+      :var => node["mso-workflow-message-adapter-config"]
+      )
+  end
+end
+
+################
+#
+######
+remote_directory "#{node['mso_config_path']}" do
+  source "mso-workflow-message-adapter-config"
+  #cookbook "default is current"
+  files_mode "0744"
+  files_owner "jboss"
+  files_group "jboss"
+  mode "0755"
+  owner "jboss"
+  group "jboss"
+  overwrite true
+  recursive true
+  action :create
+end
+
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"] %>