summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangrong Fu <fu.guangrong@zte.com.cn>2017-11-04 12:42:03 +0800
committerGuangrong Fu <fu.guangrong@zte.com.cn>2017-11-04 12:42:03 +0800
commit17308d4bb9cb15422958c0b7adfb7297a0d7a7ab (patch)
tree53acbbc2218df2fea2e8d25473fbc5ea7d471f6a
parent1be6bdd6b55219294a9ce6f708433fef3737cc13 (diff)
Fix the DCAE integration Bugs
Change-Id: Iceffaacd2d8fe277e36a5a197575811626043e22 Issue-ID: HOLMES-81 Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java2
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index 2be8824..204f352 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -34,7 +34,7 @@ public class MicroServiceConfig {
final static public String DOCKER_HOST = "DOCKER_HOST";
final static public String MSB_ADDR = "MSB_ADDR";
- private static String getEnv(String name) {
+ public static String getEnv(String name) {
String value = System.getenv(name);
if (value == null) {
value = System.getProperty(name);
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java
index f1307c4..8c98699 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import lombok.NoArgsConstructor;
@NoArgsConstructor
@@ -54,4 +55,8 @@ public class DcaeConfigurations extends HashMap<String, Object>{
public SecurityInfo getSubSecInfo(String key) {
return this.streamsSubscribes.get(key);
}
+
+ public Set<String> getSubKeys(){
+ return this.streamsSubscribes.keySet();
+ }
}