[MSO-8] Bring 1702 changes

Rework the env files values for BPMN URN.
Add SNIOR related configuration parameters.

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

diff --git a/environments/mso-docker.json b/environments/mso-docker.json
index 9261372..2217bdc 100644 (file)
--- a/environments/mso-docker.json
+++ b/environments/mso-docker.json
@@ -3,11 +3,11 @@
     "description": "MSO Docker Images",
     "chef_type": "environment",
     "json_class": "Chef::Environment",
-    "default_attributes": 
+    "default_attributes":
     {
         "mso_config_path": "/etc/mso/config.d/",
 
-        "mso-api-handler-infra-config": 
+        "mso-api-handler-infra-config":
         {
             "bpelURL": "http://mso:8080",
             "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
@@ -15,9 +15,9 @@
             "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
         },
 
-        "asdc-connections": 
+        "asdc-connections":
         {
-            "asdc-controller1": 
+            "asdc-controller1":
             {
                 "user": "user",
                 "consumerGroup": "mso",
@@ -33,7 +33,7 @@
                 "keyStorePath": ""
             },
 
-            "asdc-controller2": 
+            "asdc-controller2":
             {
                 "user": "user",
                 "consumerGroup": "mso",
@@ -50,28 +50,32 @@
             }
         },
 
-        "mso-sdnc-adapter-config": 
+        "mso-sdnc-adapter-config":
         {
-            "sdncurls": 
+            "sdncurls":
             [
                 "https://localhost:8443/restconf/operations/L3SDN-API:",
                 "https://localhost:8443/restconf/config/L3SDN-API:",
                 "https://localhost:8443/restconf/operations/Firewall-API:",
                 "https://localhost:8443/restconf/config",
                 "https://localhost:8443/restconf/operations/VNF-API:",
-                "https://localhost:8443/restconf/operations/NBNC-API:"
+                "https://localhost:8443/restconf/operations/NBNC-API:",
+                "https://localhost:8443/restconf/operations/NORTHBOUND-API:service-topology-operation",
+                "https://localhost:8443/restconf/operations/GENERIC-RESOURCE-API:",
+                "https://localhost:8443/restconf/operations/VNFTOPOLOGYAIC-API:"
             ],
 
             "bpelurl": "http://mso:8080/mso/SDNCAdapterCallbackService",
+            "restbpelurl": "http://mso:8080/mso/WorkflowMessage",
             "myurl": "http://mso:8080/adapters/rest/SDNCNotify",
             "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
             "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
             "sdncconnecttime": "5000"
         },
 
-          "mso-po-adapter-config": 
+          "mso-po-adapter-config":
         {
-            "identity_services": 
+            "identity_services":
             [
                 {
                     "dcp_clli": "RAX_KEYSTONE",
@@ -106,7 +110,7 @@
                 }
             ],
 
-            "cloud_sites": 
+            "cloud_sites":
             [
                 {
                     "id": "Dallas",
@@ -138,97 +142,128 @@
             "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
         },
 
-        "mso-bpmn-config": 
+        "mso-bpmn-config":
         {
             "urnFileSystemLoadingEnabled": "true"
         },
 
-        "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",
-            "logDebugLayer3ServiceActivateV1": "false",
-            "logDebugQueryAAICustomer": "false",
-            "logDebugQueryTenantInfo": "false",
-            "logDebugSdncAdapter": "false",
-            "logDebugVnfAdapterCreateV1": "false",
-            "logDebugVnfAdapterDeleteV1": "false",
-            "logDebugRemoveLayer3Service": "false",
-            "logDebugUpdateNetworkV2": "false",
-            "logDebugCreateVfModuleVolumeInfraV1": "false",
-            "logDebugDeleteVfModuleVolumeInfraV1": "false",
-            "logDebugUpdateVfModuleVolumeInfraV1": "false",
-            "logDebugCreateServiceInstanceInfra": "false",
-            "logDebugDeleteServiceInstanceInfra": "false",
-            "logDebugCreateNetworkInstanceInfra": "false",
-            "logDebugDeleteNetworkInstanceInfra": "false",
-            "logDebugUpdateNetworkInstanceInfra": "false",
-            "aaiEndpoint": "https://c1.vm1.aai.simpledemo.openecomp.org:8443",
-            "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
-            "adaptersDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter",
-            "adaptersSdncEndpoint": "http://mso:8080/adapters/SDNCAdapter",
-            "adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter",
-            "workflowSdncadapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService",
-            "msoKey": "07a7159d3bf51a0e53be7a8f89699be7",
-            "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
-            "sdncTimeout": "PT5M",
-            "rollback": "true",
-            "adaptersNetworkEndpoint": "http://mso:8080/networks/NetworkAdapter",
-            "adaptersNetworkRestEndpoint": "http://mso:8080/networks/rest/v1/networks",
-            "adaptersVnfAsyncEndpoint": "http://mso/vnfs/VnfAdapterAsync",
-            "workflowVnfAdapterDeleteCallback": "http://mso:8080/mso/vnfAdapterNotify",
-            "workflowVnfAdapterCreateCallback": "http://mso:8080/mso/vnfAdapterNotify",
-            "adaptersVnfRestEndpoint": "http://mso:8080/vnfs/rest/v1/vnfs",
-            "workflowVnfAdapterRestCallback": "http://mso:8080/mso/vnfAdapterRestNotify",
-            "poTimeout": "PT5M",
-            "sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui",
-            "sdncFirewallYangModelVersion": "2015-05-15",
-            "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"
-        }
+    "mso-bpmn-urn-config": {
+      "logDebugAsyncQueryAAICustomer": "false",
+      "logDebugChangeFeatureActivateV1": "false",
+      "logDebugChangeLayer3ServiceActivateV1": "false",
+      "logDebugChangeLayer3ServiceProvV1": "false",
+      "logDebugCompleteMsoProcess": "false",
+      "logDebugCreateCustomerV1": "false",
+      "logDebugCreateTenantV1": "false",
+      "logDebugDeleteNetworkV1": "false",
+      "logDebugDeleteTenantV1": "false",
+      "logDebugDeleteVCEV1": "false",
+      "logDebugGetLayer3ServiceDetailsV1": "false",
+      "logDebugL3ToHigherLayerAddBonding": "false",
+      "logDebugL3ToHigherLayerDeleteBonding": "false",
+      "invariantIdL3ToHigherLayerDeleteBonding": "50359538-066f-4a8d-807f-f2bc8eaa79dc",
+      "versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44",
+      "logDebugLayer3ServiceActivateV1": "false",
+      "logDebugQueryAAICustomer": "false",
+      "logDebugQueryTenantInfo": "false",
+      "logDebugSdncAdapter": "false",
+      "logDebugUCPEDeleteTenantV1": "false",
+      "logDebugUCPEVnfTurnup": "false",
+      "logDebugVnfAdapterCreateV1": "false",
+      "logDebugVnfAdapterDeleteV1": "false",
+      "logDebugRemoveLayer3Service": "false",
+      "logDebugLayer3TestAndTurnUpV1": "false",
+      "logDebugVnfAdapterRollbackV1": "false",
+      "logDebugVnfAdapterQueryV1": "false",
+      "logDebugCreateNetworkV1": "false",
+      "logDebugcreateCinderVolumeV1": "false",
+      "logDebugdeleteCinderVolumeV1": "false",
+      "logDebugupdateCinderVolumeV1": "false",
+      "logDebugDeleteGenericVNFV1": "false",
+      "logDebugDisconnectLayer3Service": "false",
+      "logDebugCreateNetworkV2": "false",
+      "logDebugDeleteNetworkV2": "false",
+      "logDebugCreateVfModuleVolume": "false",
+      "logDebugDeleteVfModuleVolume": "false",
+      "logDebugUpdateVfModuleVolume": "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",
+      "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",
+      "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",
+      "msoKey": "07a7159d3bf51a0e53be7a8f89699be7",
+      "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
+      "sdncTimeout": "PT5M",
+      "rollback": "true",
+      "adaptersNetworkEndpoint": "http://mso:8080/networks/NetworkAdapter",
+      "adaptersNetworkRestEndpoint": "http://mso:8080/networks/rest/v1/networks",
+      "adaptersVnfAsyncEndpoint": "http://mso:8080/vnfs/VnfAdapterAsync",
+      "workflowVnfAdapterDeleteCallback": "http://mso:8080/mso/vnfAdapterNotify",
+      "workflowVnfAdapterCreateCallback": "http://mso:8080/mso/vnfAdapterNotify",
+      "adaptersVnfRestEndpoint": "http://mso:8080/vnfs/rest/v1/vnfs",
+      "poTimeout": "PT5M",
+      "sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui",
+      "sdncFirewallYangModelVersion": "2015-05-15",
+      "sdncTimeoutFirewall": "20",
+      "sdncUcpeTimeoutHours": "120",
+      "sdncUcpeTimeoutMinutes": "5",
+      "callbackRetryAttempts": "30",
+      "callbackRetrySleepTime": "1000",
+      "csiAotsAddincidentmanagement": "https://csi-bau.it.att.com:1443/Services/com/cingular/csi/aotsremedy/AddIncidentManagementTicket.jws",
+      "canopiAuth": "63F203804F84E31D7F66DC5501A3D9FBCA5C5362B289640F5829DDA6DCF65E3A",
+      "workflowL3ToHigherLayerAddBondingModelName" : "WAN Bonding",
+      "workflowL3ToHigherLayerAddBondingModelVersion" : "2.0",
+      "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77",
+      "sniroAuth": "test:testpwd",
+      "sniroCallback": "https://mso:8443/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"
+      }
     },
 
-    "override_attributes": 
+    "override_attributes":
     {
     },
 
-    "cookbook_versions": 
+    "cookbook_versions":
     {
         "mso-config": "~> 1.0.0"
     }