From 825e00a29f1ebd4f28cdd4f4fd1ace0a47e2292c Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Wed, 19 Oct 2022 13:10:43 +0100
Subject: [SDC-DIST] Upgrade asdc-controller to use client version 2.0.0

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: DMAAP-1789
Change-Id: Icd08dcc39dd86eb2d0efdbdfd583b16d26a41627
---
 asdc-controller/src/test/resources/application-test.yaml | 4 +---
 asdc-controller/src/test/resources/mso-with-NULL.json    | 5 -----
 asdc-controller/src/test/resources/mso.json              | 5 -----
 asdc-controller/src/test/resources/mso4-with-TLS.json    | 5 -----
 4 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'asdc-controller/src/test/resources')

diff --git a/asdc-controller/src/test/resources/application-test.yaml b/asdc-controller/src/test/resources/application-test.yaml
index 31ec987152..e1fbe1ccd5 100644
--- a/asdc-controller/src/test/resources/application-test.yaml
+++ b/asdc-controller/src/test/resources/application-test.yaml
@@ -76,18 +76,16 @@ mso:
       consumerGroup: msoasdc-id-local
       consumerId: msoasdc-id-local
       environmentName: Pre-IST
-      asdcAddress: localhost:8443
+      sdcAddress: localhost:8443
       password: CB655C3C236F1F0370A347E3A0E0E133BE10ADCF4D16377E7378D3FE46A4BF60C27DF1FFB4
       pollingInterval: 30
       pollingTimeout: 30
       relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL
-      useHttpsWithDmaap: true
       activateServerTLSAuth: false
       keyStorePassword:  
       keyStorePath:
       watchDogTimeout: 1
       isFilterInEmptyResources: true
-      messageBusAddress: localhost,localhost
   asdc:
     config:
       activity:
diff --git a/asdc-controller/src/test/resources/mso-with-NULL.json b/asdc-controller/src/test/resources/mso-with-NULL.json
index aeb740f31c..8e6454fae1 100644
--- a/asdc-controller/src/test/resources/mso-with-NULL.json
+++ b/asdc-controller/src/test/resources/mso-with-NULL.json
@@ -8,11 +8,6 @@
         "asdcAddress": "hostname",
         "password": "1c551b8b5ab91fcd5a0907b11c304199",
        "watchDogTimeout": "300",
-       "messageBusAddress": [
-         "localhost",
-         "localhost",
-         "localhost"
-       ],
         "pollingInterval":10,
         "pollingTimeout":30
         
diff --git a/asdc-controller/src/test/resources/mso.json b/asdc-controller/src/test/resources/mso.json
index 6d3f7a3233..d80955f647 100644
--- a/asdc-controller/src/test/resources/mso.json
+++ b/asdc-controller/src/test/resources/mso.json
@@ -8,11 +8,6 @@
         "asdcAddress": "hostname",
         "password": "1c551b8b5ab91fcd5a0907b11c304199",
        "watchDogTimeout": "300",
-       "messageBusAddress": [
-         "localhost",
-         "localhost",
-         "localhost"
-       ],
         "pollingInterval":10,
         "pollingTimeout":30
     
diff --git a/asdc-controller/src/test/resources/mso4-with-TLS.json b/asdc-controller/src/test/resources/mso4-with-TLS.json
index e1b32b7d4a..8c14117c41 100644
--- a/asdc-controller/src/test/resources/mso4-with-TLS.json
+++ b/asdc-controller/src/test/resources/mso4-with-TLS.json
@@ -11,11 +11,6 @@
         "pollingTimeout":30,
         "activateServerTLSAuth": true,
        "watchDogTimeout": "300",
-       "messageBusAddress": [
-         "localhost",
-         "localhost",
-         "localhost"
-       ],
         "keyStorePassword":"1c551b8b5ab91fcd5a0907b11c304199",    
         "keyStorePath": "/test"
     }
-- 
cgit 1.2.3-korg