Update Properties

Fix additional password issues, found in integration testing

Issue-ID: SO-812

Change-Id: Ib9d79b1edc6ca6a9bd3ad4814481a4d32f3fbc6f

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

diff --git a/docker-compose.yml b/docker-compose.yml
index 1f9eb3c..8363553 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -93,7 +93,7 @@ services:
   sdnc-adapter:
     image: so/sdnc-adapter
     ports:
-      - "8086:8086"
+      - "8090:8086"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ./volumes/so/config/sdnc-adapter/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 2211ea6..3952127 100644 (file)
--- a/volumes/so/config/api-handler-infra/onapheat/override.yaml
+++ b/volumes/so/config/api-handler-infra/onapheat/override.yaml
@@ -10,14 +10,14 @@ mso:
   site-name: onapheat
   adapters:
     requestDb:
-      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083
-      auth: YnBlbDptc28tZGItMTUwNyE=
+      endpoint: http://request-db-adapter:8083
+      auth: Basic YnBlbDpwYXNzd29yZDEk
   catalog:
     db:
       spring:
-        endpoint: "http://c1.vm1.mso.simpledemo.onap.org:8082"
+        endpoint: "http://catalog-db-adapter:8082"
   db:
-    auth: Basic cGFzc3dvcmQxJA==
+    auth: Basic YnBlbDpwYXNzd29yZDEk
   config:
     path: /src/main/resources/
   infra:
@@ -31,7 +31,7 @@ mso:
           default:
             testApi: GR_API
   camundaURL: http://bpmn-infra:8081
-  camundaAuth: 1D9003AB8BAFFA0D2104B67FA89040AD70B5B495B2A5DF931DE236484EBC1681
+  camundaAuth: F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862
   async:
     core-pool-size: 50
     max-pool-size: 50

diff --git a/volumes/so/config/bpmn-infra/onapheat/override.yaml b/volumes/so/config/bpmn-infra/onapheat/override.yaml
index a826096..bb3f420 100644 (file)
--- a/volumes/so/config/bpmn-infra/onapheat/override.yaml
+++ b/volumes/so/config/bpmn-infra/onapheat/override.yaml
@@ -105,7 +105,7 @@ mso:
           uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group
     default:
       aai:
-        version: '8'
+        version: '14'
         cloud-region:
           version: '9'
         generic-vnf:
@@ -167,12 +167,13 @@ mso:
       default:
         aai:
           namespace: http://org.onap.aai.inventory/
+          version: 14
     message:
       endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
     notification:
       name: GenericNotificationServiceATT
     sdncadapter:
-      callback: http://c1.vm1.mso.simpledemo.onap.org:8086/mso/SDNCAdapterCallbackService
+      callback: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/SDNCAdapterCallbackService
     vnfadapter:
       create:
         callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
@@ -199,6 +200,9 @@ sdnc:
   auth: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
   host: http://c1.vm1.sdnc.simpledemo.onap.org:8282
   path: /restconf/operations/GENERIC-RESOURCE-API
+  si:
+    svc:
+      types: PORT-MIRROR,PPROBE
 
 appc:
   client:

diff --git a/volumes/so/config/sdnc-adapter/onapheat/override.yaml b/volumes/so/config/sdnc-adapter/onapheat/override.yaml
index 4cf581e..483ed6d 100644 (file)
--- a/volumes/so/config/sdnc-adapter/onapheat/override.yaml
+++ b/volumes/so/config/sdnc-adapter/onapheat/override.yaml
@@ -12,7 +12,7 @@ mso:
           spring:
             endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
     db:
-      auth: Basic cGFzc3dvcmQxJA==
+      auth: Basic YnBlbDpwYXNzd29yZDEk
     site-name: onapheat
 org:
     onap:
@@ -71,7 +71,7 @@ org:
                             changedelete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
                             delete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
                             rollback: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                    bpelauth: cGFzc3dvcmQxJA==
+                    bpelauth: c2RuY2FCcG1uOnBhc3N3b3JkMSQ=
                     bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/SDNCAdapterCallbackService
                     generic-resource:
                         network-topology-operation:
@@ -106,7 +106,7 @@ org:
                     myurl: http://c1.vm1.mso.simpledemo.onap.org:8081/adapters/rest/SDNCNotify
                     rest:
                         bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
-                    sdncauth: 406B2AE613211B6FB52466DE6E1769AC
+                    sdncauth: 263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73
                     sdncconnecttime: 5000
                     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:'