Update Properties

Update Properties as a result of integration lab testing

Issue-ID: SO-812

Change-Id: Id09f79b008436dc75901606f81f9af8102f1695b

Change-Id: Id09f79b008436dc75901606f81f9af8102f1695b
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

diff --git a/deploy.sh b/deploy.sh
index d5ce4f0..9201f43 100755 (executable)
--- a/deploy.sh
+++ b/deploy.sh
@@ -156,4 +156,4 @@ fi
 $DOCKER_COMPOSE_CMD up -d --no-recreate mariadb 
 CONTAINER_NAME=$(container_name mariadb)
 wait_for_mariadb $CONTAINER_NAME
-$DOCKER_COMPOSE_CMD up -d mso 
+$DOCKER_COMPOSE_CMD up

diff --git a/docker-compose.yml b/docker-compose.yml
index 2a02858..1f9eb3c 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
   catalog-db-adapter:
     image: so/catalog-db-adapter
     ports:
-      - "8082"
+      - "8082:8082"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ./volumes/so/config/catalog-db-adapter/onapheat:/app/config
@@ -59,7 +59,7 @@ services:
   request-db-adapter:
     image: so/request-db-adapter
     ports:
-      - "8083"
+      - "8083:8083"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ./volumes/so/config/request-db-adapter/onapheat:/app/config
@@ -93,7 +93,7 @@ services:
   sdnc-adapter:
     image: so/sdnc-adapter
     ports:
-      - "8086"
+      - "8086:8086"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ./volumes/so/config/sdnc-adapter/onapheat:/app/config
@@ -128,7 +128,7 @@ services:
   openstack-adapter:
     image: so/openstack-adapter
     ports:
-      - "8087"
+      - "8087:8087"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ./volumes/so/config/openstack-adapter/onapheat:/app/config
@@ -163,7 +163,7 @@ services:
   vfc-adapter:
     image: so/vfc-adapter
     ports:
-      - "8084"
+      - "8084:8084"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ./volumes/so/config/vfc-adapter/onapheat:/app/config
@@ -198,7 +198,7 @@ services:
   asdc-controller:
     image: so/asdc-controller
     ports:
-      - "8085"
+      - "8085:8085"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ./volumes/so/config/asdc-controller/onapheat:/app/config
@@ -233,7 +233,7 @@ services:
   bpmn-infra:
     image: so/bpmn-infra
     ports:
-      - "8081"
+      - "8081:8081"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ./volumes/so/config/bpmn-infra/onapheat:/app/config
@@ -268,7 +268,7 @@ services:
   api-handler-infra:
     image: so/api-handler-infra
     ports:
-      - "8080"
+      - "8080:8080"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ./volumes/so/config/api-handler-infra/onapheat:/app/config

diff --git a/volumes/so/config/api-handler-infra/onapheat/override.yaml b/volumes/so/config/api-handler-infra/onapheat/override.yaml
index f812789..37b7f29 100644 (file)
--- a/volumes/so/config/api-handler-infra/onapheat/override.yaml
+++ b/volumes/so/config/api-handler-infra/onapheat/override.yaml
@@ -5,12 +5,17 @@ server:
 ssl-enable: false
 
 mso:
+  msoKey: "07a7159d3bf51a0e53be7a8f89699be7"
   logPath: logs
   site-name: onapheat
+  adapters:
+    requestDb:
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083
+      auth: YnBlbDptc28tZGItMTUwNyE=
   catalog:
     db:
       spring:
-        endpoint: "http://c1.vm1.mso.simpledemo.openecomp.org:8082"
+        endpoint: "http://c1.vm1.mso.simpledemo.onap.org:8082"
   db:
     auth: Basic cGFzc3dvcmQxJA==
   config:
@@ -28,11 +33,11 @@ mso:
   apih:
     homing:
       sdna:
-        url: http://c1.vm1.mso.simpledemo.openecomp.org:8086/
+        url: http://c1.vm1.mso.simpledemo.onap.org:8086/
         password: 4112B789E942B161228F7D5AFC654C0F
-  bpelURL: http://c1.vm1.mso.simpledemo.openecomp.org:8082/
+  bpelURL: http://c1.vm1.mso.simpledemo.onap.org:8082/
   bpelAuth: 786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1
-  camundaURL: http://c1.vm1.mso.simpledemo.openecomp.org:8082/
+  camundaURL: http://c1.vm1.mso.simpledemo.onap.org:8082/
   camundaAuth: 5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1
   async:
     core-pool-size: 50
@@ -44,7 +49,7 @@ mso:
     activate:
       instanceid: test
       userid: cs0008
-    endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:28090
+    endpoint: http://c1.vm1.mso.simpledemo.onap.org:28090
   msoKey: 07a7159d3bf51a0e53be7a8f89699be7
   tenant:
     isolation:
@@ -58,7 +63,7 @@ mso:
       dmaap:
         username: testuser
         password: VjR5NDcxSzA=
-        host: http://c1.vm1.mso.simpledemo.openecomp.org:28090
+        host: http://c1.vm1.mso.simpledemo.onap.org:28090
       publisher:
         topic: com.att.ecomp.mso.operationalEnvironmentEvent
 

diff --git a/volumes/so/config/asdc-controller/onapheat/override.yaml b/volumes/so/config/asdc-controller/onapheat/override.yaml
index 6afc196..9e4b572 100644 (file)
--- a/volumes/so/config/asdc-controller/onapheat/override.yaml
+++ b/volumes/so/config/asdc-controller/onapheat/override.yaml
@@ -1,3 +1,6 @@
+aai:
+  auth: 2630606608347B7124C244AB0FE34F6F
+
 server:
   port: 8085
 
@@ -37,11 +40,12 @@ request:
       test-on-borrow: true
 
 mso:
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
   logPath: ./logs/asdc
   catalog:
     db:
       spring:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
   db:
     auth: Basic YnBlbDpwYXNzd29yZDEk
   site-name: onapheat
@@ -52,8 +56,8 @@ mso:
       user: mso
       consumerGroup: sdc-OpenSource-Env1
       consumerId: sdc-COpenSource-Env11
-      environmentName: SDC-OpenSource-Env1
-      asdcAddress: c2.vm1.sdc.simpledemo.openecomp.org:8443
+      environmentName: AUTO
+      asdcAddress: c2.vm1.sdc.simpledemo.onap.org:8443
       password: 613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247
       pollingInterval: 60
       pollingTimeout: 60
@@ -63,7 +67,7 @@ mso:
       keyStorePath:
       watchDogTimeout: 60
       isFitlerInEmptyResources: true
-      messageBusAddress: c2.vm1.sdc.simpledemo.openecomp.org
+      messageBusAddress: vm1.mr.simpledemo.onap.org,vm1.mr.simpledemo.onap.org
   asdc:
     config:
       key: 566B754875657232314F5548556D3665

diff --git a/volumes/so/config/bpmn-infra/onapheat/override.yaml b/volumes/so/config/bpmn-infra/onapheat/override.yaml
index 52f558a..fc8125b 100644 (file)
--- a/volumes/so/config/bpmn-infra/onapheat/override.yaml
+++ b/volumes/so/config/bpmn-infra/onapheat/override.yaml
@@ -16,6 +16,7 @@ entitymanager:
   packagesToScan: com
 
 mso:
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
   correlation:
     timeout: 60
   logPath: logs
@@ -25,53 +26,53 @@ mso:
     queue-capacity: 500
   adapters:
     completemsoprocess:
-      endpoint:  http://c1.vm1.mso.simpledemo.openecomp.org:8081/CompleteMsoProcess
+      endpoint:  http://c1.vm1.mso.simpledemo.onap.org:8081/CompleteMsoProcess
     db:
       auth: 26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764
       password: wLg4sjrAFUS8rfVfdvTXeQ==
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083/services/RequestsDbAdapter
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter
       spring:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083
     network:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/NetworkAdapter
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/NetworkAdapter
       rest:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/rest/v1/networks
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/networks
     openecomp:
       db:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083/services/RequestsDbAdapter
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter
     po:
       auth: 757A94191D685FD2092AC1490730A4FC
       password: 3141634BF7E070AA289CF2892C986C0B
     sdnc:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8086/adapters/SDNCAdapter
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/SDNCAdapter
       rest:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8086/adapters/rest/v1/sdnc
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/v1/sdnc
       timeout: PT60S
     tenant:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/TenantAdapter
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/TenantAdapter
     vnf:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/VnfAdapter
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapter
       rest:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/rest/vnfs/v1/vnfs
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/vnfs/v1/vnfs
     volume-groups:
       rest:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/rest/v1/volume-groups
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/volume-groups
     vnf-async:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/VnfAdapterAsync
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapterAsync
   bpmn:
     process:
       historyTimeToLive: '30'
   callbackRetryAttempts: '5'
   catalog:
     db:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082/ecomp/mso/catalog
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082/ecomp/mso/catalog
       spring:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
   db:
     auth: Basic YnBlbDptc28tZGItMTUwNyE=
   default:
     adapter:
-      namespace: http://org.openecomp.mso
+      namespace: http://org.onap.mso
   healthcheck:
     log:
       debug: 'false'
@@ -83,7 +84,7 @@ mso:
     timeout: PT60S
   request:
     db:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083/
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/
   rollback: 'true'
   sdnc:
     password: 3141634BF7E070AA289CF2892C986C0B
@@ -91,11 +92,11 @@ mso:
     agnostic:
       sniro:
         endpoint: /sniro/api/v2/placement
-        host: http://c1.vm1.mso.simpledemo.openecomp.org:30253
+        host: http://c1.vm1.mso.simpledemo.onap.org:30253
   site-name: CamundaEngine
   sniro:
     auth: test:testpwd
-    callback: http://c1.vm1.mso.simpledemo.openecomp.org:8086/adapters/rest/SDNCNotify
+    callback: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/SDNCNotify
     endpoint: http://replaceme:28090/optimizationInstance/V1/create
     timeout: PT30M
   workflow:
@@ -166,22 +167,22 @@ mso:
     global:
       default:
         aai:
-          namespace: http://org.openecomp.aai.inventory/
+          namespace: http://org.onap.aai.inventory/
     message:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8081/mso/WorkflowMessage
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
     notification:
       name: GenericNotificationServiceATT
     sdncadapter:
-      callback: http://c1.vm1.mso.simpledemo.openecomp.org:8086/mso/SDNCAdapterCallbackService
+      callback: http://c1.vm1.mso.simpledemo.onap.org:8086/mso/SDNCAdapterCallbackService
     vnfadapter:
       create:
-        callback: http://c1.vm1.mso.simpledemo.openecomp.org:8087/mso/vnfAdapterNotify
+        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
       delete:
-        callback: http://c1.vm1.mso.simpledemo.openecomp.org:8087/mso/vnfAdapterNotify
+        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
       query:
-        callback: http://c1.vm1.mso.simpledemo.openecomp.org:8087/mso/vnfAdapterNotify
+        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
       rollback:
-        callback: http://c1.vm1.mso.simpledemo.openecomp.org:8087/mso/vnfAdapterNotify
+        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
   global:
     dmaap:
       username: testuser
@@ -216,7 +217,7 @@ appc:
     key: VIlbtVl6YLhNUrtU
     secret: 64AG2hF4pYeG2pq7CT6XwUOT
     service: ueb
-    poolMembers: ueb1.simpledemo.openecomp.org:3904,ueb2.simpledemo.openecomp.org:3904
+    poolMembers: ueb1.simpledemo.onap.org:3904,ueb2.simpledemo.onap.org:3904
 server:
   port: 8081
   tomcat:

diff --git a/volumes/so/config/catalog-db-adapter/onapheat/override.yaml b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml
index 11f65db..e2235b4 100644 (file)
--- a/volumes/so/config/catalog-db-adapter/onapheat/override.yaml
+++ b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml
@@ -9,7 +9,7 @@ mso:
   catalog:
     db:
       spring:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
   db:
     auth: Basic YnBlbDpwYXNzd29yZDEk
 spring:

diff --git a/volumes/so/config/openstack-adapter/onapheat/override.yaml b/volumes/so/config/openstack-adapter/onapheat/override.yaml
index b1d7279..67614c5 100644 (file)
--- a/volumes/so/config/openstack-adapter/onapheat/override.yaml
+++ b/volumes/so/config/openstack-adapter/onapheat/override.yaml
@@ -91,7 +91,7 @@ mso:
   catalog:
     db:
       spring:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
   db:
     auth: Basic YnBlbDptc28tZGItMTUwNyE=
   site-name: localDevEnv

diff --git a/volumes/so/config/sdnc-adapter/onapheat/override.yaml b/volumes/so/config/sdnc-adapter/onapheat/override.yaml
index 19da1a9..5108113 100644 (file)
--- a/volumes/so/config/sdnc-adapter/onapheat/override.yaml
+++ b/volumes/so/config/sdnc-adapter/onapheat/override.yaml
@@ -10,7 +10,7 @@ mso:
     catalog:
         db:
           spring:
-            endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082
+            endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
     db:
       auth: Basic cGFzc3dvcmQxJA==
     site-name: onapheat
@@ -72,7 +72,7 @@ org:
                             delete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
                             rollback: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
                     bpelauth: cGFzc3dvcmQxJA==
-                    bpelurl: http://c1.vm1.mso.simpledemo.openecomp.org:8081/mso/SDNCAdapterCallbackService
+                    bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/SDNCAdapterCallbackService
                     generic-resource:
                         network-topology-operation:
                             activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
@@ -103,18 +103,18 @@ org:
                     mobility:
                         '':
                             query: GET|60000|sdncurl5|
-                    myurl: http://c1.vm1.mso.simpledemo.openecomp.org:8081/adapters/rest/SDNCNotify
+                    myurl: http://c1.vm1.mso.simpledemo.onap.org:8081/adapters/rest/SDNCNotify
                     rest:
-                        bpelurl: http://c1.vm1.mso.simpledemo.openecomp.org:8081/mso/WorkflowMessage
+                        bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
                     sdncauth: 406B2AE613211B6FB52466DE6E1769AC
                     sdncconnecttime: 5000
-                    sdncurl10: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/GENERIC-RESOURCE-API:'
-                    sdncurl11: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNFTOPOLOGYAIC-API:'
-                    sdncurl12: http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/
-                    sdncurl5: http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/config
-                    sdncurl6: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNF-API:'
-                    sdncurl8: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NBNC-API:'
-                    sdncurl9: http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NORTHBOUND-API:service-topology-operation
+                    sdncurl10: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/GENERIC-RESOURCE-API:'
+                    sdncurl11: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/VNFTOPOLOGYAIC-API:'
+                    sdncurl12: http://c1.vm1.sdnc.simpledemo.onap.org:8282/
+                    sdncurl5: http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/config
+                    sdncurl6: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/VNF-API:'
+                    sdncurl8: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/NBNC-API:'
+                    sdncurl9: http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/NORTHBOUND-API:service-topology-operation
                     service:
                         infra:
                             service-topology-infra-activate-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1