diff options
| -rw-r--r-- | attributes/default.rb | 158 | ||||
| -rw-r--r-- | attributes/mso-bpmn-urn-config.rb | 157 | ||||
| -rw-r--r-- | attributes/topology.rb | 3 | ||||
| -rw-r--r-- | recipes/bpmn.rb | 3 | ||||
| -rw-r--r-- | recipes/createConfigDirectories.rb | 1 | ||||
| -rw-r--r-- | recipes/jra.rb | 3 | ||||
| -rw-r--r-- | recipes/mso-workflow-message-adapter-config.rb | 37 | ||||
| -rw-r--r-- | templates/default/mso-bpmn-config/mso.bpmn.urn.properties | 103 | ||||
| -rwxr-xr-x[-rw-r--r--] | templates/default/mso-sdnc-adapter-config/mso.sdnc.properties | 76 | ||||
| -rw-r--r-- | templates/default/mso-topology-config/topology.properties | 1 | ||||
| -rw-r--r-- | templates/default/mso-workflow-message-adapter-config/mso.workflow-message-adapter.properties | 7 |
11 files changed, 368 insertions, 181 deletions
diff --git a/attributes/default.rb b/attributes/default.rb index d46722f..2f42e69 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -4,6 +4,13 @@ node.default['mso_config_path'] = '/opt/mso/etc/ecomp/mso/config' ###################### +# AFT +########## +node.default["aft"]["latitude"] = "" +node.default["aft"]["longitude"] = "" +node.default["aft"]["environment"] = "" # AFTUAT || AFTPRD + +###################### # APIH INFRA ########## node.default["mso-api-handler-infra-config"]["bpelURL"] = "DefaultRecipe_bpelURL" @@ -21,13 +28,12 @@ node.default["mso-api-handler-infra-config"]["volume.v1.ApiAllowableActions"] = node.default["mso-api-handler-infra-config"]["volume.v2.ApiAllowableActions"] = "DELETE_VF_MODULE_VOL,UPDATE_VF_MODULE_VOL" node.default["mso-api-handler-infra-config"]["volume.v3.ApiAllowableActions"] = "CREATE_VF_MODULE_VOL,DELETE_VF_MODULE_VOL,UPDATE_VF_MODULE_VOL" - - ###################### # JRA ########## 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" @@ -105,115 +111,39 @@ 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"]["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"]["adaptersTenantEndpoint"] = "DefaultRecipe_adaptersTenantEndpoint" -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"]["workflowVnfAdapterRestCallback"] = "DefaultRecipe_workflowVnfAdapterRestCallback" -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" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAINetworkGenericVnfUri"] = "/aai/v3/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDoCreateVfModuleVolumeV1AAINetworkGenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDeleteGenericVNFV1AAINetworkGenericVnfUri"] = "/aai/v6/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAINetworkVpnBindingUri"] = "/aai/v6/network/vpn-bindings/vpn-binding" -node.default["mso-bpmn-urn-config"]["workflowCreateNetworkV1AAINetworkVpnBindingUri"] = "" -node.default["mso-bpmn-urn-config"]["workflowCreateNetworkV2AAINetworkVpnBindingUri"] = "" -node.default["mso-bpmn-urn-config"]["workflowCreateNetworkInstanceInfraAAINetworkVpnBindingUri"] = "/aai/v8/network/vpn-bindings/vpn-binding" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAINetworkVceUri"] = "/aai/v2/network/vces/vce" -node.default["mso-bpmn-urn-config"]["workflowDeleteVCEV1AAINetworkVceUri"] = "" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAINetworkL3NetworkUri"] = "/aai/v8/network/l3-networks/l3-network" -node.default["mso-bpmn-urn-config"]["workflowCreateNetworkV1AAINetworkL3NetworkUri"] = "/aai/v6/network/l3-networks/l3-network" -node.default["mso-bpmn-urn-config"]["workflowDeleteNetworkV1AAINetworkL3NetworkUri"] = "/aai/v6/network/l3-networks/l3-network" -node.default["mso-bpmn-urn-config"]["workflowCreateNetworkInstanceInfraAAINetworkL3NetworkUri"] = "/aai/v8/network/l3-networks/l3-network" -node.default["mso-bpmn-urn-config"]["workflowDeleteNetworkInstanceInfraAAINetworkL3NetworkUri"] = "/aai/v8/network/l3-networks/l3-network" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIBusinessCustomerUri"] = "/aai/v6/business/customers/customer" -node.default["mso-bpmn-urn-config"]["workflowCreateServiceInstanceInfraAAIBusinessCustomerUri"] = "/aai/v8/business/customers/customer" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAICloudInfrastructureVolumeGroupUri"] = "/aai/v6/cloud-infrastructure/volume-groups/volume-group" -node.default["mso-bpmn-urn-config"]["workflowCreateNetworkV2AAINetworkVpnBindingUri"] = "" -node.default["mso-bpmn-urn-config"]["workflowCreateNetworkV2AAINetworkPolicyUri"] = "" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAICloudInfrastructureTenantUri"] = "/aai/v5/cloud-infrastructure/tenants/tenant" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAISearchGenericQueryUri"] = "/aai/v2/search/generic-query" -node.default["mso-bpmn-urn-config"]["workflowCreateServiceInstanceInfraAAISearchGenericQueryUri"] = "/aai/v8/search/generic-query" -node.default["mso-bpmn-urn-config"]["workflowUCPERemoveLayer3ServiceAAISearchGenericQueryUri"] = "/aai/v6/search/generic-query" -node.default["mso-bpmn-urn-config"]["workflowCreateAAIVfModuleAAINetworkGenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDeleteAAIVfModuleAAINetworkGenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDoCreateVfModuleAAINetworkGenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowPrepareUpdateAAIVfModuleAAINetworkGenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowUpdateAAIVfModuleAAINetworkGenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAICloudInfrastructureCloudRegionUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic" -node.default["mso-bpmn-urn-config"]["workflowCreateNetworkInstanceInfraAAICloudInfrastructureCloudRegionUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic" -node.default["mso-bpmn-urn-config"]["workflowDoCreateVfModuleVolumeV1AAICloudInfrastructureCloudRegionUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic" -node.default["mso-bpmn-urn-config"]["workflowDeleteVfModuleVolumeInfraV1AAICloudInfrastructureCloudRegionUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAISearchNodesQueryUri"] = "/aai/v8/search/nodes-query" -node.default["mso-bpmn-urn-config"]["workflowCreateAAIVfModuleVolumeGroupAaiNetworkGenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" + +################################################################## +# 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" ###################### # appc @@ -234,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/attributes/topology.rb b/attributes/topology.rb index 72df8ba..13160fc 100644 --- a/attributes/topology.rb +++ b/attributes/topology.rb @@ -12,6 +12,7 @@ node.default["mso-config"]["topology"]["ssl-enable"] = "false" node.default["mso-config"]["topology"]["apih-healthcheck-urn"] = "/ecomp/mso/infra/healthcheck,/asdc/healthcheck,/dbadapters/healthcheck" node.default["mso-config"]["topology"]["jra-healthcheck-urn"] = "/networks/rest/healthcheck,/adapters/rest/healthcheck,/vnfs/rest/healthcheck,/tenants/rest/healthcheck" -node.default["mso-config"]["topology"]["camunda-healthcheck-urn"] = "/mso/healthcheck" +node.default["mso-config"]["topology"]["camunda-healthcheck-urn"] = "/mso/healthcheck,/mso/common/healthcheck" node.default["mso-config"]["topology"]["apih-nodehealthcheck-urn"] = "/ecomp/mso/infra/nodehealthcheck" node.default["mso-config"]["topology"]["jra-nodehealthcheck-urn"] = "/adapters/rest/nodehealthcheck" +node.default["mso-config"]["topology"]["camunda-nodehealthcheck-urn"] = "/mso/nodehealthcheck" diff --git a/recipes/bpmn.rb b/recipes/bpmn.rb index 94bb5f7..6d34606 100644 --- a/recipes/bpmn.rb +++ b/recipes/bpmn.rb @@ -1,6 +1,7 @@ ################ # Deploy bpmn config set -# +# ###### include_recipe "mso-config::mso-bpmn-config" +include_recipe "mso-config::mso-topology-config" diff --git a/recipes/createConfigDirectories.rb b/recipes/createConfigDirectories.rb index a983b02..f04dee0 100644 --- a/recipes/createConfigDirectories.rb +++ b/recipes/createConfigDirectories.rb @@ -9,7 +9,6 @@ owner "jboss" group "jboss" mode "0755" - recursive true action :create end end 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 7f8e823..5831549 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,50 @@ 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"] %> +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.DHVActivateService=<%= @var["logDebugDHVActivateService"] %> +log.debug.SNIROAdapter=<%= @var["logDebugSNIROAdapter"] %> +mso.infra.customer.id=<%= @var["infraCustomerId"] %> +mso.sniro.auth=<%= @var["sniroAuth"] %> +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.workflow.message.endpoint=<%= @var["adaptersWorkflowMessageEndpoint"] %> +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 +96,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 +106,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 diff --git a/templates/default/mso-sdnc-adapter-config/mso.sdnc.properties b/templates/default/mso-sdnc-adapter-config/mso.sdnc.properties index 3e0e6df..ae66c0a 100644..100755 --- a/templates/default/mso-sdnc-adapter-config/mso.sdnc.properties +++ b/templates/default/mso-sdnc-adapter-config/mso.sdnc.properties @@ -12,9 +12,10 @@ <% indexplusone = index + 1 %> <%= "org.openecomp.mso.adapters.sdnc.sdncurl#{indexplusone}=#{url}" %> <% end %> -### BPEL ASYNC CALLLBACK/NOTIFICATION URL +### BPEL ASYNC CALLBACK/NOTIFICATION URL ### org.openecomp.mso.adapters.sdnc.bpelurl=<%= @var["bpelurl"] %> +org.openecomp.mso.adapters.sdnc.rest.bpelurl=<%= @var["restbpelurl"] %> ### ### SDNC ASYNC NOTIFICATION/RESPONSE URL ### @@ -27,12 +28,13 @@ org.openecomp.mso.adapters.sdnc.sdncconnecttime=<%= @var["sdncconnecttime"] %> ### Distinct Requests Supported by SDNCA. sdncurls added on top of file. fields may be null eg msoaction,operation resulting in .. construct ### ###org.openecomp.mso.adapters.sdnc.MSOACTION.OPERATION.ACTION=METHOD|TIMEOUT|URL|HEADERNAME|NAMESPACE -### - -org.openecomp.mso.adapters.sdnc.mobility..query=GET|60000|sdncurl4| +### +org.openecomp.mso.adapters.sdnc..service-homing-operation.homing=POST|60000|sdncurl3|sdnc-homing-header|org:openecomp:sdnctl:aicHoming +org.openecomp.mso.adapters.sdnc.infra..query=GET|60000|sdncurl5| +org.openecomp.mso.adapters.sdnc.mobility..query=GET|60000|sdncurl5| org.openecomp.mso.adapters.sdnc...query=GET|60000|sdncurl2| -org.openecomp.mso.adapters.sdnc...put=PUT|60000|sdncurl4| -org.openecomp.mso.adapters.sdnc...restdelete=DELETE|60000|sdncurl4| +org.openecomp.mso.adapters.sdnc...put=PUT|60000|sdncurl5| +org.openecomp.mso.adapters.sdnc...restdelete=DELETE|60000|sdncurl5| org.openecomp.mso.adapters.sdnc.gammainternet.svc-topology-operation.assign=POST|60000|sdncurl1|sdnc-request-header|org:openecomp:sdnctl:l3api org.openecomp.mso.adapters.sdnc.gammainternet.svc-topology-operation.delete=POST|250000|sdncurl1|sdnc-request-header|org:openecomp:sdnctl:l3api org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.reserve=POST|60000|sdncurl1|sdnc-request-header|org:openecomp:sdnctl:l3api @@ -42,23 +44,47 @@ org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.tu org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.changereserve=POST|60000|sdncurl1|sdnc-request-header|org:openecomp:sdnctl:l3api org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.changedelete=POST|250000|sdncurl1|sdnc-request-header|org:openecomp:sdnctl:l3api org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.changeactivate=POST|60000|sdncurl1|sdnc-request-header|org:openecomp:sdnctl:l3api -org.openecomp.mso.adapters.sdnc..feature-configuration-operation.activate=POST|60000|sdncurl3|sdnc-feature-request-header|org:openecomp:sdnctl:firewallapi -org.openecomp.mso.adapters.sdnc..feature-configuration-operation.changeactivate=POST|60000|sdncurl3|sdnc-feature-request-header|org:openecomp:sdnctl:firewallapi -org.openecomp.mso.adapters.sdnc..feature-configuration-operation.delete=POST|60000|sdncurl3|sdnc-feature-request-header|org:openecomp:sdnctl:firewallapi -org.openecomp.mso.adapters.sdnc..vnf-topology-operation.assign=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..vnf-topology-operation.activate=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..vnf-topology-operation.rollback=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..vnf-topology-operation.delete=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..vnf-topology-operation.changeassign=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..vnf-topology-operation.changedelete=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..network-topology-operation.reserve=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..network-topology-operation.assign=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..network-topology-operation.activate=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..network-topology-operation.rollback=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..network-topology-operation.delete=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..network-topology-operation.changeassign=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf -org.openecomp.mso.adapters.sdnc..network-topology-operation.changedelete=POST|270000|sdncurl5|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..feature-configuration-operation.activate=POST|60000|sdncurl4|sdnc-feature-request-header|org:openecomp:sdnctl:firewallapi +org.openecomp.mso.adapters.sdnc..feature-configuration-operation.changeactivate=POST|60000|sdncurl4|sdnc-feature-request-header|org:openecomp:sdnctl:firewallapi +org.openecomp.mso.adapters.sdnc..feature-configuration-operation.delete=POST|60000|sdncurl4|sdnc-feature-request-header|org:openecomp:sdnctl:firewallapi +org.openecomp.mso.adapters.sdnc..vnf-topology-operation.assign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..vnf-topology-operation.activate=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..vnf-topology-operation.rollback=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..vnf-topology-operation.delete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..vnf-topology-operation.changeassign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..vnf-topology-operation.changedelete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..network-topology-operation.reserve=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..network-topology-operation.assign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..network-topology-operation.activate=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +org.openecomp.mso.adapters.sdnc..network-topology-operation.rollback=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf +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..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.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.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 +org.openecomp.mso.adapters.sdnc.service.vhngw.service-topology-infra-register-vnf-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1 +org.openecomp.mso.adapters.sdnc.service.vhngw.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1 +org.openecomp.mso.adapters.sdnc.service.vvig.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1 +org.openecomp.mso.adapters.sdnc.service.vvig.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1 +org.openecomp.mso.adapters.sdnc.service.pe.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1 +org.openecomp.mso.adapters.sdnc.service.pe.service-topology-cust-stage-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1 +org.openecomp.mso.adapters.sdnc.service.pe.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|org:openecomp:sdnctl:northbound-api:v1 + +org.openecomp.mso.adapters.sdnc..service-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|org:openecomp:sdnctl:generic-resource +org.openecomp.mso.adapters.sdnc..service-topology-operation.rollback=POST|270000|sdncur10|sdnc-request-header|org:openecomp:sdnctl:generic-resource +org.openecomp.mso.adapters.sdnc..service-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|org:openecomp:sdnctl:generic-resource +org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|org:openecomp:sdnctl:generic-resource +org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|org:openecomp:sdnctl:generic-resource +org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|org:openecomp:sdnctl:generic-resource +org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|org:openecomp:sdnctl:generic-resource -org.openecomp.mso.adapters.sdnc..svc-topology-operation.assign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:nbncapi -org.openecomp.mso.adapters.sdnc..svc-topology-operation.activate=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:nbncapi -org.openecomp.mso.adapters.sdnc..svc-topology-operation.delete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:nbncapi +org.openecomp.mso.adapters.sdnc..vnf-topology-aic-operation.assign=POST|270000|sdncurl11|sdnc-request-header|org:openecomp:sdnctl:vnftopologyaic +org.openecomp.mso.adapters.sdnc..vnf-topology-aic-operation.activate=POST|270000|sdncurl11|sdnc-request-header|org:openecomp:sdnctl:vnftopologyaic diff --git a/templates/default/mso-topology-config/topology.properties b/templates/default/mso-topology-config/topology.properties index 46fbc92..a4f3331 100644 --- a/templates/default/mso-topology-config/topology.properties +++ b/templates/default/mso-topology-config/topology.properties @@ -15,3 +15,4 @@ camunda-healthcheck-urn=<%= @var["camunda-healthcheck-urn"] %> apih-nodehealthcheck-urn=<%= @var["apih-nodehealthcheck-urn"] %>
jra-nodehealthcheck-urn=<%= @var["jra-nodehealthcheck-urn"] %>
+camunda-nodehealthcheck-urn=<%= @var["camunda-nodehealthcheck-urn"] %>
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"] %> |