Update mso-docker.config

I believe this file in chef-repo should be the same as
the one one in docker-config.

Issue: SO-274
Change-Id: I336e477dd9d57405ee88fd80b507c7466fdbb7fb
Signed-off-by: Rob Daugherty <rd472p@att.com>

diff --git a/environments/mso-docker.json b/environments/mso-docker.json
index 9011843..7053857 100644 (file)
--- a/environments/mso-docker.json
+++ b/environments/mso-docker.json
@@ -19,11 +19,11 @@
     {
       "asdc-controller1":
       {
-        "user": "user",
-        "consumerGroup": "mso",
-        "consumerId": "mso",
-        "environmentName": "PROD",
-        "asdcAddress": "asdc_hostname1:8443",
+        "user": "mso",
+        "consumerGroup": "sdc-OpenSource-Env1",
+        "consumerId": "sdc-COpenSource-Env11",
+        "environmentName": "SDC-OpenSource-Env1",
+        "asdcAddress": "c2.vm1.sdc.simpledemo.openecomp.org:8443",
         "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247",
         "pollingInterval": 60,
         "pollingTimeout": 60,
@@ -54,20 +54,20 @@
     {
       "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/NORTHBOUND-API:service-topology-operation",
-        "https://localhost:8443/restconf/operations/GENERIC-RESOURCE-API:",
-        "https://localhost:8443/restconf/operations/VNFTOPOLOGYAIC-API:"
+        "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/L3SDN-API:",
+        "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/config/L3SDN-API:",
+        "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/Firewall-API:",
+        "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/config",
+        "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNF-API:",
+        "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:"
       ],
 
-      "bpelurl": "http://mso:8080/mso/SDNCAdapterCallbackService",
-      "restbpelurl": "http://mso:8080/mso/WorkflowMessage",
-      "myurl": "http://mso:8080/adapters/rest/SDNCNotify",
+      "bpelurl": "http://c1.vm1.mso.simpledemo.openecomp.org:8080/mso/SDNCAdapterCallbackService",
+      "restbpelurl": "http://c1.vm1.mso.simpledemo.openecomp.org:8080/mso/WorkflowMessage",
+      "myurl": "http://c1.vm1.mso.simpledemo.openecomp.org:8080/adapters/rest/SDNCNotify",
       "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
       "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
       "sdncconnecttime": "5000"
@@ -80,33 +80,13 @@
         {
           "dcp_clli": "RAX_KEYSTONE",
           "identity_url": "https://identity.api.rackspacecloud.com/v2.0",
-          "mso_id": "PUT_YOUR_TENANT_ID_HERE",
-          "mso_pass": "ENCRYPT_YOUR_API_KEY_HERE",
+          "mso_id": "RACKSPACE_ACCOUNT_ID",
+          "mso_pass": "RACKSPACE_ACCOUNT_APIKEY",
           "admin_tenant": "service",
           "member_role": "admin",
           "tenant_metadata": "true",
           "identity_server_type": "KEYSTONE",
           "identity_authentication_type": "RACKSPACE_APIKEY"
-        },
-
-        {
-          "dcp_clli": "MT_KEYSTONE2",
-          "identity_url": "https://localhost:5000/v2.0",
-          "mso_id": "PUT_YOUR_USER_NAME_HERE",
-          "mso_pass": "ENCRYPT_YOUR_PASSWORD_HERE",
-          "admin_tenant": "service",
-          "member_role": "admin",
-          "tenant_metadata": "true",
-          "identity_server_type": "KEYSTONE",
-          "identity_authentication_type": "USERNAME_PASSWORD"
-        },
-
-        {
-          "id": "MT2",
-          "aic_version": "2.5",
-          "lcp_clli": "MT2",
-          "region_id": "lcp_region",
-          "identity_service_id": "MT_KEYSTONE2"
         }
       ],
 
@@ -142,19 +122,46 @@
       "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
     },
 
+    "mso-workflow-message-adapter-config":
+    {
+      "wmbpelurl": "http://mso:8080/mso/WorkflowMessage",
+      "wmbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+    },
+
+    "mso-appc-adapter-config":
+    {
+      "appc_url": "http://localhost:18080",
+      "appc_stub": "/AppC-Simulator/action/execute",
+      "appc_auth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
+      "appc_timeout": "30",
+      "ueb_cluster_address": "http://localhost:18080",
+      "ueb_consumer_group": "testgroup",
+      "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",
+      "bpel_stub": "/AppC-Simulator/bpmn/appCResponse",
+      "bpel_auth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
+      "bpel_timeout": "30"
+    },
+
     "mso-bpmn-config":
     {
       "urnFileSystemLoadingEnabled": "true"
     },
 
-    "mso-bpmn-urn-config": {
+    "mso-bpmn-urn-config":
+    {
       "debug":"false",
       "invariantIdL3ToHigherLayerDeleteBonding": "50359538-066f-4a8d-807f-f2bc8eaa79dc",
       "versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44",
       "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",
+      "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",
@@ -163,7 +170,7 @@
       "mso.infra.customer.id": "21014aa2-526b-11e6-beb8-9e71128cae77",
       "aaiEndpoint": "https://aai.api.simpledemo.openecomp.org:8443",
       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
-      "adaptersNamespace": "http:://org.openecomp.mso",
+      "adaptersNamespace": "http://org.openecomp.mso",
       "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
       "adaptersDbEndpoint": "http://mso:8080/dbadapters/MsoRequestsDbAdapter",
       "adaptersOpenecompDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter",