X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=environments%2Fmso-docker.json;h=ad28d0295ced222b996964d358ca4ccd1d764395;hb=HEAD;hp=70538575908f6dfedad18c010881131b56cd71fa;hpb=35b136f4925af52ef4a66307254c7f82cfb63eac;p=so%2Fchef-repo.git

diff --git a/environments/mso-docker.json b/environments/mso-docker.json
index 7053857..ad28d02 100644
--- a/environments/mso-docker.json
+++ b/environments/mso-docker.json
@@ -7,12 +7,29 @@
   {
     "mso_config_path": "/etc/mso/config.d/",
 
+    "mso-topology-config":
+    {
+      "msb-server-ip": "172.30.3.34",
+      "msb-server-port": "80"
+    },
+
     "mso-api-handler-infra-config":
     {
       "bpelURL": "http://mso:8080",
       "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
       "camundaURL": "http://mso:8080",
-      "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+      "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
+      "aaiEndpoint": "https://aai.api.simpledemo.onap.org:8443",
+      "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
+      "msoKey": "07a7159d3bf51a0e53be7a8f89699be7",
+	  "extApiEndpoint": "http://nbi.onap:8080/nbi/api/v3"
+    },
+
+    "mso-asdc-controller-config":
+    {
+      "aaiEndpoint": "https://aai.api.simpledemo.onap.org:8443",
+      "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
+      "msoKey": "07a7159d3bf51a0e53be7a8f89699be7"
     },
 
     "asdc-connections":
@@ -62,7 +79,8 @@
         "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NBNC-API:",
         "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NORTHBOUND-API:service-topology-operation",
         "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/GENERIC-RESOURCE-API:",
-        "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNFTOPOLOGYAIC-API:"
+        "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNFTOPOLOGYAIC-API:",
+        "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/"
       ],
 
       "bpelurl": "http://c1.vm1.mso.simpledemo.openecomp.org:8080/mso/SDNCAdapterCallbackService",
@@ -139,7 +157,6 @@
       "ueb_consumer_id": "testuser",
       "ueb_topic": "queuetopic",
       "ueb_polling_interval": "30",
-      "ueb_polling_interval": "30",
       "ueb_user": "user",
       "ueb_password": "1ec0d74615d4e4639f991c0590c83b88",
       "bpel_url": "http://localhost:18080",
@@ -160,15 +177,16 @@
       "versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44",
       "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77",
       "sniroAuth": "test:testpwd",
-      "sniroCallback": "http://mso.api.simpledemo.openecomp.org:8080/adapters/rest/SDNCNotify/SNIROResponse",
       "sniroEndpoint": "http://sniro.api.simpledemo.openecomp.org:8080/sniro/api/v2/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://aai.api.simpledemo.openecomp.org:8443",
+      "serviceAgnosticSniroHost": "http://sniro.api.simpledemo.openecomp.org:8080",
+      "serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement",
+      "oofAuth": "test:testpwd",
+      "oofEndpoint": "http://oof.api.simpledemo.openecomp.org:8698/api/oof/v1/placement",
+      "oofTimeout": "PT30M",
+      "serviceAgnosticOofHost": "http://oof.api.simpledemo.openecomp.org:8698",
+      "serviceAgnosticOofEndpoint": "/api/oof/v1/placement",
+      "aaiEndpoint": "https://aai.api.simpledemo.onap.org:8443",
       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
       "adaptersNamespace": "http://org.openecomp.mso",
       "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
@@ -179,8 +197,11 @@
       "adaptersSdncRestEndpoint": "http://mso:8080/adapters/rest/v1/sdnc",
       "adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter",
       "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
+      "adaptersWorkflowMessageEndpoint": "http://mso.api.simpledemo.openecomp.org:8080/workflows/messages/message",
       "workflowMessageEndpoint": "http://mso:8080/mso/WorkflowMessage",
       "workflowSdncAdapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService",
+      "workflowSdncReplicationDelay": "PT5S",
+      "workflowAaiDistributionDelay": "PT30S",
       "msoKey": "07a7159d3bf51a0e53be7a8f89699be7",
       "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
       "sdncTimeout": "PT5M",
@@ -198,8 +219,21 @@
       "sdncTimeoutFirewall": "20",
       "callbackRetryAttempts": "30",
       "callbackRetrySleepTime": "1000",
-      "workflowL3ToHigherLayerAddBondingModelName" : "WAN Bonding",
-      "workflowL3ToHigherLayerAddBondingModelVersion" : "2.0"
+      "appcClientTopicRead": "APPC-LCM-WRITE",
+      "appcClientTopicWrite": "APPC-LCM-READ",
+      "appcClientTopicSdncRead": "SDNC-LCM-WRITE",
+      "appcClientTopicSdncWrite": "SDNC-LCM-READ",
+      "appcClientTopicReadTimeout": "360000",
+      "appcClientResponseTime": "360000",
+      "appcClientPoolMembers": "ueb1.simpledemo.openecomp.org:3904,ueb2.simpledemo.openecomp.org:3904",
+      "appcClientKey": "VIlbtVl6YLhNUrtU",
+      "appcClientSecret": "64AG2hF4pYeG2pq7CT6XwUOT",
+      "appcClientService": "ueb",
+      "sdncSiSvcTypes": "PORT-MIRROR,PPROBE",
+      "workflowL3ToHigherLayerAddBondingModelName": "WAN Bonding",
+      "workflowL3ToHigherLayerAddBondingModelVersion": "2.0",
+      "msoDefaultCloudOwnerId": "att-aic",
+	  "extApiEndpoint": "http://nbi.onap:8080/nbi/api/v3"
     }
   },