From 18526e9a01fc0b0e085d2a6e3457957e6392ce27 Mon Sep 17 00:00:00 2001 From: Sirisha_Manchikanti Date: Tue, 1 Jun 2021 16:48:25 +0100 Subject: Prepare controlloop docker images Generate runtime, policy-participant and dcae-participant docker images. Issue-ID: POLICY-3320 Signed-off-by: Sirisha_Manchikanti Change-Id: I310fd2a098aa48a6a50a9bf6bd2bcb55328f4973 --- .../main/parameters/ClRuntimeParameterGroup.java | 1 - .../InstantiationConfigParametersStd.json | 22 +--------------------- .../resources/parameters/MinimumParametersH2.json | 20 +------------------- .../test/resources/parameters/TestParameters.json | 22 +--------------------- .../parameters/TestParametersMariaDB.json | 22 +--------------------- .../src/test/resources/parameters/Unreadable.json | 22 +--------------------- 6 files changed, 5 insertions(+), 104 deletions(-) (limited to 'runtime-controlloop') diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterGroup.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterGroup.java index 4c99b8e57..ba25a6dad 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterGroup.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterGroup.java @@ -42,7 +42,6 @@ public class ClRuntimeParameterGroup extends ParameterGroupImpl { private PolicyModelsProviderParameters databaseProviderParameters; private ParticipantParameters participantParameters; private TopicParameterGroup topicParameterGroup; - private List healthCheckRestClientParameters; /** * Create the Control Loop parameter group. diff --git a/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json index 7682a1812..410c35684 100644 --- a/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json +++ b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json @@ -55,25 +55,5 @@ "topicCommInfrastructure": "dmaap" } ] - }, - "healthCheckRestClientParameters": [ - { - "clientName": "api", - "hostname": "policy-api", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "policy/api/v1/healthcheck" - }, - { - "clientName": "distribution", - "hostname": "policy-distribution", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "healthcheck" - } - ] + } } diff --git a/runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json b/runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json index f784dcd16..cce0ab5ee 100644 --- a/runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json +++ b/runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json @@ -37,23 +37,5 @@ "servers" : [ "message-router" ], "topicCommInfrastructure" : "dmaap" }] - }, - "healthCheckRestClientParameters":[{ - "clientName": "api", - "hostname": "policy-api", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "policy/api/v1/healthcheck" - }, - { - "clientName": "distribution", - "hostname": "policy-distribution", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "healthcheck" - }] + } } diff --git a/runtime-controlloop/src/test/resources/parameters/TestParameters.json b/runtime-controlloop/src/test/resources/parameters/TestParameters.json index c3be762d6..9fbcfb28c 100644 --- a/runtime-controlloop/src/test/resources/parameters/TestParameters.json +++ b/runtime-controlloop/src/test/resources/parameters/TestParameters.json @@ -55,25 +55,5 @@ "topicCommInfrastructure": "dmaap" } ] - }, - "healthCheckRestClientParameters": [ - { - "clientName": "api", - "hostname": "policy-api", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "policy/api/v1/healthcheck" - }, - { - "clientName": "distribution", - "hostname": "policy-distribution", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "healthcheck" - } - ] + } } diff --git a/runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json b/runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json index 2c0127b16..529557eab 100644 --- a/runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json +++ b/runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json @@ -55,25 +55,5 @@ "topicCommInfrastructure": "dmaap" } ] - }, - "healthCheckRestClientParameters": [ - { - "clientName": "api", - "hostname": "policy-api", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "policy/api/v1/healthcheck" - }, - { - "clientName": "distribution", - "hostname": "policy-distribution", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "healthcheck" - } - ] + } } diff --git a/runtime-controlloop/src/test/resources/parameters/Unreadable.json b/runtime-controlloop/src/test/resources/parameters/Unreadable.json index 3d117f416..1c1e93897 100644 --- a/runtime-controlloop/src/test/resources/parameters/Unreadable.json +++ b/runtime-controlloop/src/test/resources/parameters/Unreadable.json @@ -55,24 +55,4 @@ "topicCommInfrastructure": "dmaap" } ] - }, - "healthCheckRestClientParameters": [ - { - "clientName": "api", - "hostname": "policy-api", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "policy/api/v1/healthcheck" - }, - { - "clientName": "distribution", - "hostname": "policy-distribution", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "useHttps": true, - "basePath": "healthcheck" - } - ] + } -- cgit 1.2.3-korg