From 61ddb92b0697da7ca958279d168a6ea6f65157d7 Mon Sep 17 00:00:00 2001 From: xg353y Date: Wed, 3 May 2017 17:43:30 +0200 Subject: Bring 1707 changes Bring 1707 changes : update the bpmn configuration parameters. Change-Id: Ic06715a884b3d0a01a94ef022b57dc8260615a22 Signed-off-by: xg353y --- volumes/mso/chef-config/mso-docker.json | 96 ++++----------------------------- 1 file changed, 11 insertions(+), 85 deletions(-) diff --git a/volumes/mso/chef-config/mso-docker.json b/volumes/mso/chef-config/mso-docker.json index 3b1f863..9c0355f 100644 --- a/volumes/mso/chef-config/mso-docker.json +++ b/volumes/mso/chef-config/mso-docker.json @@ -129,80 +129,29 @@ "mso-bpmn-urn-config": { - "logDebugAsyncQueryAAICustomer": "false", - "logDebugChangeFeatureActivateV1": "false", - "logDebugChangeLayer3ServiceActivateV1": "false", - "logDebugChangeLayer3ServiceProvV1": "false", - "logDebugLayer3TestAndTurnUpV1": "false", - "logDebugVnfAdapterRollbackV1": "false", - "logDebugVnfAdapterQueryV1": "false", - "logDebugCreateNetworkV1": "false", - "logDebugCreateCinderVolumeV1": "false", - "logDebugDeleteCinderVolumeV1": "false", - "logDebugUpdateCinderVolumeV1": "false", - "logDebugDeleteGenericVNFV1": "false", - "logDebugDisconnectLayer3Service": "false", - "logDebugCompleteMsoProcess": "false", - "logDebugCreateCustomerV1": "false", - "logDebugCreateTenantV1": "false", - "logDebugDeleteNetworkV1": "false", - "logDebugDeleteTenantV1": "false", - "logDebugDeleteVCEV1": "false", - "logDebugGetLayer3ServiceDetailsV1": "false", - "logDebugL3ToHigherLayerAddBonding": "false", - "logDebugL3ToHigherLayerDeleteBonding": "false", + "debug":"false", "invariantIdL3ToHigherLayerDeleteBonding": "50359538-066f-4a8d-807f-f2bc8eaa79dc", "versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44", - "logDebugLayer3ServiceActivateV1": "false", - "logDebugQueryAAICustomer": "false", - "logDebugQueryTenantInfo": "false", - "logDebugSdncAdapter": "false", - "logDebugVnfAdapterCreateV1": "false", - "logDebugVnfAdapterDeleteV1": "false", - "logDebugRemoveLayer3Service": "false", - "logDebugUpdateNetworkV2": "false", - "logDebugCreateNetworkV2": "false", - "logDebugDeleteNetworkV2": "false", - "logDebugCreateVfModuleVolumeInfraV1": "false", - "logDebugDeleteVfModuleVolumeInfraV1": "false", - "logDebugUpdateVfModuleVolumeInfraV1": "false", - "logDebugCreateServiceInstanceInfra": "false", - "logDebugDeleteServiceInstanceInfra": "false", - "logDebugCreateNetworkInstanceInfra": "false", - "logDebugDeleteNetworkInstanceInfra": "false", - "logDebugUpdateNetworkInstanceInfra": "false", - "logDebugCreateNetworkInstance": "false", - "logDebugDoCreateNetworkInstance": "false", - "logDebugDoCreateNetworkInstanceRollback": "false", - "logDebugDeleteNetworkInstance": "false", - "logDebugDoDeleteNetworkInstance": "false", - "logDebugDoDeleteNetworkInstanceRollback": "false", - "logDebugCreateViprAtmService": "false", - "logDebugDeleteViprAtmService": "false", - "logDebugGenericGetService": "false", - "logDebugGenericPutService": "false", - "logDebugGenericDeleteService": "false", - "logDebugCreateServiceInstance": "false", - "logDebugDelServiceInstance": "false", - "logDebugRollbackServiceInstance": "false", - "logDebugDoCreateServiceInstanceRollback": "false", - "logDebugDoDeleteServiceInstance": "false", - "logDebugDoCreateVfModuleVolumeRollback": "false", - "logDebugDoDeleteVfModuleVolumeRollback": "false", - "logDebugDoDeleteVfModuleVolumeV1": "false", - "logDebugDoCreateVfModuleVolumeV1": "false", + "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77", + "sniroAuth": "test:testpwd", + "sniroCallback": "https://mso:8080/adapters/rest/SDNCNotify/SNIROResponse", + "sniroEndpoint": "https://TODO.att.c om:14699/sniro/api/v1/placement", + "sniroTimeout": "PT30M", + "sniroPoliciesDHV2vvig": "SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1", + "sniroPoliciesDHV4vvig": "SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.VNFPolicy_vvigprimary2_v1,SNIRO.VNFPolicy_vvigsecondary2_v1,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1", "mso.sniro.endpoint": "/optimizationInstance/V1/create", "mso.sniro.callback": "/adapters/rest/SDNCNotify/SNIROResponse", "mso.infra.customer.id": "21014aa2-526b-11e6-beb8-9e71128cae77", "aaiEndpoint": "https://c1.vm1.aai.simpledemo.openecomp.org:8443", "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess", "adaptersDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter", + "catalogDbEndpoint": "http://mso:8080/ecomp/mso/catalog", "adaptersSdncEndpoint": "http://mso:8080/adapters/SDNCAdapter", "adaptersSdncRestEndpoint": "http://mso:8080/adapters/rest/v1/sdnc", "adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter", "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", "workflowMessageEndpoint": "http://mso:8080/mso/WorkflowMessage", - "workflowSdncadApterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService", + "workflowSdncAdapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService", "msoKey": "07a7159d3bf51a0e53be7a8f89699be7", "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", "sdncTimeout": "PT5M", @@ -220,31 +169,8 @@ "sdncTimeoutFirewall": "20", "callbackRetryAttempts": "30", "callbackRetrySleepTime": "1000", - "workflowDefaultAAINetworkGenericVnfUri": "/aai/v8/network/generic-vnfs/generic-vnf", - "workflowDeleteGenericVNFV1AAINetworkGenericVnfUri": "/aai/v8/network/generic-vnfs/generic-vnf", - "workflowDefaultAAINetworkVpnBindingUri": "/aai/v8/network/vpn-bindings/vpn-binding", - "workflowCreateNetworkV1AAINetworkVpnBindingUri": "", - "workflowDefaultAAINetworkVceUri": "/aai/v8/network/vces/vce", - "workflowDeleteVCEV1AAINetworkVceUri": "", - "workflowDefaultAAINetworkL3NetworkUri": "/aai/v8/network/l3-networks/l3-network", - "workflowCreateNetworkV1AAINetworkL3NetworkUri": "/aai/v8/network/l3-networks/l3-network", - "workflowDeleteNetworkV1AAINetworkL3NetworkUri": "/aai/v8/network/l3-networks/l3-network", - "workflowDefaultAAIBusinessCustomerUri": "/aai/v8/business/customers/customer", - "workflowDefaultAAICloudInfrastructureVolumeGroupUri": "/aai/v8/cloud-infrastructure/volume-groups/volume-group", - "workflowCreateCinderVolumeV1AAICloudInfrastructureVolumeGroupUri": "", - "workflowDefaultAAICloudInfrastructureTenantUri": "/aai/v8/cloud-infrastructure/tenants/tenant", - "workflowDefaultAAISearchGenericQueryUri": "/aai/v8/search/generic-query", - "aaiAuth": "2630606608347B7124C244AB0FE34F6F", "workflowL3ToHigherLayerAddBondingModelName" : "WAN Bonding", - "workflowL3ToHigherLayerAddBondingModelVersion" : "2.0", - "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77", - "sniroAuth": "test:testpwd", - "sniroCallback": "http://mso:8080/adapters/rest/SDNCNotify/SNIROResponse", - "sniroEndpoint": "https://TODO.att.com:14699/sniro/api/v1/placement", - "sniroTimeout": "PT30M", - "sniroPoliciesDHV2vvig": "SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1", - "sniroPoliciesDHV4vvig": "SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.VNFPolicy_vvigprimary2_v1,SNIRO.VNFPolicy_vvigsecondary2_v1,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1", - "catalogDbEndpoint": "http://mso:8080/ecomp/mso/catalog" + "workflowL3ToHigherLayerAddBondingModelVersion" : "2.0" } }, -- cgit 1.2.3-korg