aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-distribution-ci
diff options
context:
space:
mode:
Diffstat (limited to 'sdc-distribution-ci')
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/core/config/DistributionClientConfig.java24
1 files changed, 14 insertions, 10 deletions
diff --git a/sdc-distribution-ci/src/main/java/org/onap/test/core/config/DistributionClientConfig.java b/sdc-distribution-ci/src/main/java/org/onap/test/core/config/DistributionClientConfig.java
index 3f002a3..f229216 100644
--- a/sdc-distribution-ci/src/main/java/org/onap/test/core/config/DistributionClientConfig.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/core/config/DistributionClientConfig.java
@@ -33,15 +33,12 @@ public class DistributionClientConfig implements IConfiguration {
public static final String DEFAULT_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U";
public static final int DEFAULT_POLLING_INTERVAL = 20;
public static final int DEFAULT_POLLING_TIMEOUT = 20;
- public static final String DEFAULT_STATUS_TOPIC = "STATUS-TOPIC";
- public static final String DEFAULT_NOTIF_TOPIC = "NOTIF-TOPIC";
public static final String DEFAULT_USER = "dcae";
public static final String DEFAULT_KEY_STORE_PATH = "etc/sdc-client.jks";
public static final String DEFAULT_KEY_STORE_PASSWORD = "Aa123456";
public static final boolean DEFAULT_ACTIVATE_SERVER_TLS_AUTH = false;
public static final boolean DEFAULT_IS_FILTER_IN_EMPTY_RESOURCES = true;
public static final boolean DEFAULT_USE_HTTPS_WITH_SDC = false;
- public static final String DEFAULT_MSG_BUS_ADDRESS = "localhost:9092";
private String sdcAddress;
private String user;
private String password;
@@ -53,12 +50,11 @@ public class DistributionClientConfig implements IConfiguration {
private String comsumerID;
private String keyStorePath;
private String keyStorePassword;
+ private final String trustStorePath;
+ private final String trustStorePassword;
private boolean activateServerTLSAuth;
private boolean isFilterInEmptyResources;
private boolean useHttpsWithSDC;
- private List<String> msgBusAddress;
- private String sdcStatusTopicName;
- private String sdcNotificationTopicName;
private String kafkaSecurityProtocolConfig;
private String kafkaSaslMechanism;
private String kafkaSaslJaasConfig;
@@ -70,8 +66,6 @@ public class DistributionClientConfig implements IConfiguration {
public DistributionClientConfig() {
this.sdcAddress = DEFAULT_SDC_ADDRESS;
- this.sdcStatusTopicName = DEFAULT_STATUS_TOPIC;
- this.sdcNotificationTopicName = DEFAULT_NOTIF_TOPIC;
this.comsumerID = DEFAULT_COMSUMER_ID;
this.consumerGroup = DEFAULT_CONSUMER_GROUP;
this.environmentName = DEFAULT_ENVIRONMENT_NAME;
@@ -83,11 +77,11 @@ public class DistributionClientConfig implements IConfiguration {
this.user = DEFAULT_USER;
this.keyStorePath = DEFAULT_KEY_STORE_PATH;
this.keyStorePassword = DEFAULT_KEY_STORE_PASSWORD;
+ this.trustStorePath = DEFAULT_KEY_STORE_PATH;
+ this.trustStorePassword = DEFAULT_KEY_STORE_PASSWORD;
this.activateServerTLSAuth = DEFAULT_ACTIVATE_SERVER_TLS_AUTH;
this.isFilterInEmptyResources = DEFAULT_IS_FILTER_IN_EMPTY_RESOURCES;
this.useHttpsWithSDC = DEFAULT_USE_HTTPS_WITH_SDC;
- this.msgBusAddress = new ArrayList<>();
- this.msgBusAddress.add(DEFAULT_MSG_BUS_ADDRESS);
}
@Override
@@ -145,6 +139,16 @@ public class DistributionClientConfig implements IConfiguration {
return keyStorePassword;
}
+ @Override
+ public String getTrustStorePath() {
+ return trustStorePath;
+ }
+
+ @Override
+ public String getTrustStorePassword() {
+ return trustStorePassword;
+ }
+
public String getComsumerID() {
return comsumerID;
}