[MSO-8] Commit 1702 changes

Update BPMN and SDNC related settings and add more parameter in topology recipe.

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

1 files changed, 59 insertions, 41 deletions

diff --git a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
index 7f8e823..7aecf5d 100644
--- a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
+++ b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
@@ -10,6 +10,8 @@ log.debug.deleteVCEV1=<%= @var["logDebugDeleteVCEV1"] %>
 log.debug.getLayer3ServiceDetailsV1=<%= @var["logDebugGetLayer3ServiceDetailsV1"] %>
 log.debug.l3ToHigherLayerAddBonding=<%= @var["logDebugL3ToHigherLayerAddBonding"] %>
 log.debug.l3ToHigherLayerDeleteBonding=<%= @var["logDebugL3ToHigherLayerDeleteBonding"] %>
+mso.workflow.l3ToHigherLayerAddBonding.model.invariantid=<%= @var["invariantIdL3ToHigherLayerDeleteBonding"] %>
+mso.workflow.l3ToHigherLayerAddBonding.model.versionid=<%= @var["versionIdL3ToHigherLayerDeleteBonding"] %>
 log.debug.Layer3ServiceActivateV1=<%= @var["logDebugLayer3ServiceActivateV1"] %>
 log.debug.QueryAAICustomer=<%= @var["logDebugQueryAAICustomer"] %>
 log.debug.QueryTenantInfo=<%= @var["logDebugQueryTenantInfo"] %>
@@ -40,12 +42,47 @@ log.debug.DeleteServiceInstanceInfra=<%= @var["logDebugDeleteServiceInstanceInfr
 log.debug.CreateNetworkInstanceInfra=<%= @var["logDebugCreateNetworkInstanceInfra"] %>
 log.debug.DeleteNetworkInstanceInfra=<%= @var["logDebugDeleteNetworkInstanceInfra"] %>
 log.debug.UpdateNetworkInstanceInfra=<%= @var["logDebugUpdateNetworkInstanceInfra"] %>
+log.debug.CreateNetworkInstance=<%= @var["logDebugCreateNetworkInstance"] %>
+log.debug.DoCreateNetworkInstance=<%= @var["logDebugDoCreateNetworkInstance"] %>
+log.debug.DoCreateNetworkInstanceRollback=<%= @var["logDebugDoCreateNetworkInstanceRollback"] %>
+log.debug.DeleteNetworkInstance=<%= @var["logDebugDeleteNetworkInstance"] %>
+log.debug.DoDeleteNetworkInstance=<%= @var["logDebugDoDeleteNetworkInstance"] %>
+log.debug.DoDeleteNetworkInstanceRollback=<%= @var["logDebugDoDeleteNetworkInstanceRollback"] %>
+log.debug.CreateViprAtmService=<%= @var["logDebugCreateViprAtmService"] %>
+log.debug.DeleteViprAtmService=<%= @var["logDebugDeleteViprAtmService"] %>
+log.debug.GenericGetService=<%= @var["logDebugGenericGetService"] %>
+log.debug.GenericPutService=<%= @var["logDebugGenericPutService"] %>
+log.debug.GenericDeleteService=<%= @var["logDebugGenericDeleteService"] %>
+log.debug.CreateServiceInstance=<%= @var["logDebugCreateServiceInstance"] %>
+log.debug.DelServiceInstance=<%= @var["logDebugDelServiceInstance"] %>
+log.debug.RollbackServiceInstance=<%= @var["logDebugRollbackServiceInstance"] %>
+log.debug.DoCreateServiceInstanceRollback=<%= @var["logDebugDoCreateServiceInstanceRollback"] %>
+log.debug.DoDeleteServiceInstance=<%= @var["logDebugDoDeleteServiceInstance"] %>
+log.debug.DoCreateVfModuleVolumeRollback=<%= @var["logDebugDoCreateVfModuleVolumeRollback"] %>
+log.debug.DoDeleteVfModuleVolumeRollback=<%= @var["logDebugDoDeleteVfModuleVolumeRollback"] %>
+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"] %>
+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"] %>
+mso.sniro.policies.dhv.4vvig=<%= @var["sniroPoliciesDHV4vvig"] %>
+mso.catalog.db.endpoint=<%= @var["catalogDbEndpoint"] %>
 aai.endpoint=<%= @var["aaiEndpoint"] %>
 mso.adapters.completemsoprocess.endpoint=<%= @var["adaptersCompletemsoprocessEndpoint"] %>
 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.workflow.sdncadapter.callback=<%= @var["workflowSdncadapterCallback"] %>
+mso.adapters.db.auth=<%= @var["adaptersDbAuth"] %>
+mso.workflow.message.endpoint=<%= @var["workflowMessageEndpoint"] %>
+mso.workflow.sdncadapter.callback=<%= @var["workflowSdncAdapterCallback"] %>
 mso.msoKey=<%= @var["msoKey"] %>
 mso.adapters.po.auth=<%= @var["adaptersPoAuth"] %>
 mso.sdnc.timeout=<%= @var["sdncTimeout"] %>
@@ -56,7 +93,6 @@ mso.adapters.vnf-async.endpoint=<%= @var["adaptersVnfAsyncEndpoint"] %>
 mso.workflow.vnfadapter.delete.callback=<%= @var["workflowVnfAdapterDeleteCallback"] %>
 mso.workflow.vnfadapter.create.callback=<%= @var["workflowVnfAdapterCreateCallback"] %>
 mso.adapters.vnf.rest.endpoint=<%= @var["adaptersVnfRestEndpoint"] %>
-mso.workflow.vnfadapter.rest.callback=<%= @var["workflowVnfAdapterRestCallback"] %>
 mso.po.timeout=<%= @var["poTimeout"] %>
 mso.sdnc.firewall.yang.model=<%= @var["sdncFirewallYangModel"] %>
 mso.sdnc.firewall.yang.model.version=<%= @var["sdncFirewallYangModelVersion"] %>
@@ -67,44 +103,26 @@ mso.use.qualified.host=<%= @var["useQualifiedHost"] %>
 mso.workflow.l3ToHigherLayerAddBonding.model.name=<%= @var["workflowL3ToHigherLayerAddBondingModelName"] %>
 mso.workflow.l3ToHigherLayerAddBonding.model.version=<%= @var["workflowL3ToHigherLayerAddBondingModelVersion"] %>
 mso.sitename=<%= @envname %>
-mso.workflow.default.aai.network.generic-vnf.uri=<%= @var["workflowDefaultAAINetworkGenericVnfUri"] %>
-mso.workflow.deleteGenericVNFV1.aai.network.generic-vnf.uri=<%= @var["workflowDeleteGenericVNFV1AAINetworkGenericVnfUri"] %>
-mso.workflow.DoCreateVfModuleVolumeV1.aai.network.generic-vnf.uri=<%= @var["workflowDoCreateVfModuleVolumeV1AAINetworkGenericVnfUri"] %>
-mso.workflow.default.aai.network.vpn-binding.uri=<%= @var["workflowDefaultAAINetworkVpnBindingUri"] %>
-mso.workflow.CreateNetworkV2.aai.network.vpn-binding.uri=<%= @var["workflowCreateNetworkV2AAINetworkVpnBindingUri"] %>
-mso.workflow.CreateNetworkInstanceInfra.aai.network.vpn-binding.uri=<%= @var["workflowCreateNetworkInstanceInfraAAINetworkVpnBindingUri"] %>
-mso.workflow.default.aai.network.policy.uri=<%= @var["workflowDefaultAAINetworkPolicyUri"] %>
-mso.workflow.CreateNetworkV2.aai.network.policy.uri=<%= @var["workflowCreateNetworkV2AAINetworkPolicyUri"] %>
-mso.workflow.createNetworkV1.aai.network.generic-vnf.uri=<%= @var["workflowCreateNetworkV1AAINetworkVpnBindingUri"] %>
-mso.workflow.default.aai.network.vce.uri=<%= @var["workflowDefaultAAINetworkVceUri"] %>
-mso.workflow.deleteVCEV1.aai.network.vce.uri=<%= @var["workflowDeleteVCEV1AAINetworkVceUri"] %>
-mso.workflow.default.aai.network.l3-network.uri=<%= @var["workflowDefaultAAINetworkL3NetworkUri"] %>
-mso.workflow.createNetworkV1.aai.network.l3-network.uri=<%= @var["workflowCreateNetworkV1AAINetworkL3NetworkUri"] %>
-mso.workflow.deleteNetworkV1.aai.network.l3-network.uri=<%= @var["workflowDeleteNetworkV1AAINetworkL3NetworkUri"] %>
-mso.workflow.CreateNetworkV2.aai.network.l3-network.uri=<%= @var["workflowCreateNetworkV2AAINetworkL3NetworkUri"] %>
-mso.workflow.DeleteNetworkV2.aai.network.l3-network.uri=<%= @var["workflowDeleteNetworkV2AAINetworkL3NetworkUri"] %>
-mso.workflow.UpdateNetworkV2.aai.network.l3-network.uri=<%= @var["workflowUpdateNetworkV2AAINetworkL3NetworkUri"] %>
-mso.workflow.CreateNetworkInstanceInfra.aai.network.l3-network.uri=<%= @var["workflowCreateNetworkInstanceInfraAAINetworkL3NetworkUri"] %>
-mso.workflow.DeleteNetworkInstanceInfra.aai.network.l3-network.uri=<%= @var["workflowDeleteNetworkInstanceInfraAAINetworkL3NetworkUri"] %>
-mso.workflow.default.aai.business.customer.uri=<%= @var["workflowDefaultAAIBusinessCustomerUri"] %>
-mso.workflow.CreateServiceInstanceInfra.aai.business.customer.uri=<%= @var["workflowCreateServiceInstanceInfraAAIBusinessCustomerUri"] %>
-mso.workflow.default.aai.cloud-infrastructure.volume-group.uri=<%= @var["workflowDefaultAAICloudInfrastructureVolumeGroupUri"] %>
-mso.workflow.default.aai.cloud-infrastructure.tenant.uri=<%= @var["workflowDefaultAAICloudInfrastructureTenantUri"] %>
-mso.workflow.default.aai.search.generic-query.uri=<%= @var["workflowDefaultAAISearchGenericQueryUri"] %>
-mso.workflow.CreateServiceInstanceInfra.aai.search.generic-query.uri=<%= @var["workflowCreateServiceInstanceInfraAAISearchGenericQueryUri"] %>
-mso.workflow.default.aai.search.nodes-query.uri=<%= @var["workflowDefaultAAISearchNodesQueryUri"] %>
-mso.workflow.ucpeRemoveLayer3Service.aai.search.generic-query.uri=<%= @var["workflowUCPERemoveLayer3ServiceAAISearchGenericQueryUri"] %>
-mso.workflow.CreateAAIVfModule.aai.network.generic-vnf.uri=<%= @var["workflowCreateAAIVfModuleAAINetworkGenericVnfUri"] %>
-mso.workflow.DeleteAAIVfModule.aai.network.generic-vnf.uri=<%= @var["workflowDeleteAAIVfModuleAAINetworkGenericVnfUri"] %>
-mso.workflow.DoCreateVfModule.aai.network.generic-vnf.uri=<%= @var["workflowDoCreateVfModuleAAINetworkGenericVnfUri"] %>
-mso.workflow.PrepareUpdateAAIVfModule.aai.network.generic-vnf.uri=<%= @var["workflowPrepareUpdateAAIVfModuleAAINetworkGenericVnfUri"] %>
-mso.workflow.UpdateAAIVfModule.aai.network.generic-vnf.uri=<%= @var["workflowUpdateAAIVfModuleAAINetworkGenericVnfUri"] %>
-mso.workflow.default.aai.cloud-infrastructure.cloud-region.uri=<%= @var["workflowDefaultAAICloudInfrastructureCloudRegionUri"] %>
-mso.workflow.CreateNetworkInstanceInfra.aai.cloud-infrastructure.cloud-region.uri=<%= @var["workflowCreateNetworkInstanceInfraAAICloudInfrastructureCloudRegionUri"] %>
-mso.workflow.DoCreateVfModuleVolumeV1.aai.cloud-infrastructure.cloud-region.uri=<%= @var["workflowDoCreateVfModuleVolumeV1AAICloudInfrastructureCloudRegionUri"] %>
-mso.workflow.DeleteVfModuleVolumeInfraV1.aai.cloud-infrastructure.cloud-region.uri=<%= @var["workflowDeleteVfModuleVolumeInfraV1AAICloudInfrastructureCloudRegionUri"] %>
-mso.workflow.CreateAAIVfModuleVolumeGroup.aai.network.generic-vnf.uri=<%= @var["workflowCreateAAIVfModuleVolumeGroupAaiNetworkGenericVnfUri"] %>
+mso.workflow.global.default.aai.version=<%= @var["workflowGlobalDefaultAAIVersion"] %>
+mso.workflow.default.aai.v8.generic-vnf.uri=<%= @var["workflowDefaultAAIV8GenericVnfUri"] %>
+mso.workflow.default.aai.v8.vpn-binding.uri=<%= @var["workflowDefaultAAIV8VpnBindingUri"] %>
+mso.workflow.default.aai.v8.network-policy.uri=<%= @var["workflowDefaultAAIV8NetworkPolicyUri"] %>
+mso.workflow.default.aai.v8.route-table-reference.uri=<%= @var["workflowDefaultAAIV8RouteTableReferenceUri"] %>
+mso.workflow.default.aai.v8.vce.uri=<%= @var["workflowDefaultAAIV8VceUri"] %>
+mso.workflow.default.aai.v8.l3-network.uri=<%= @var["workflowDefaultAAIV8L3NetworkUri"] %>
+mso.workflow.default.aai.v8.customer.uri=<%= @var["workflowDefaultAAIV8CustomerUri"] %>
+mso.workflow.default.aai.v8.tenant.uri=<%= @var["workflowDefaultAAIV8TenantUri"] %>
+mso.workflow.default.aai.v8.generic-query.uri=<%= @var["workflowDefaultAAIV8GenericQueryUri"] %>
+#note the CloudRegionURI is used for volume-groups
+mso.workflow.default.aai.v8.cloud-region.uri=<%= @var["workflowDefaultAAIV8CloudRegionUri"] %>
+mso.workflow.default.aai.v8.nodes-query.uri=<%= @var["workflowDefaultAAIV8NodesQueryUri"] %>
+#Override A&AI version for generic-vnf and cloud-region (for volume-groups)
+mso.workflow.default.aai.generic-vnf.version=<%= @var["workflowDefaultAAIGenericVnfUriVersion"] %>
+mso.workflow.default.aai.v9.generic-vnf.uri=<%= @var["workflowDefaultAAIV9GenericVnfUri"] %>
+mso.workflow.default.aai.cloud-region.version=<%= @var["workflowDefaultAAICloudRegionUriVersion"] %>
+mso.workflow.default.aai.v9.cloud-region.uri=<%= @var["workflowDefaultAAIV9CloudRegionUri"] %>
+# DHVCreateService and its subflows need v9 for 'customer' starting in 1702
+mso.workflow.DHVCreateService.aai.customer.uri=<%= @var["workflowDHVCreateServiceAAICustomerUri"] %>
 <% if @var.has_key?('aaiAuth') %>
 aai.auth=<%= @var["aaiAuth"] %>
-<% end %>
-
+<% end %>
\ No newline at end of file