Fix the DCAE integration Bugs

Change-Id: Iceffaacd2d8fe277e36a5a197575811626043e22
Issue-ID: HOLMES-81
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>

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 (file)
--- 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";\r
     final static public String MSB_ADDR = "MSB_ADDR";\r
 \r
-    private static String getEnv(String name) {\r
+    public static String getEnv(String name) {\r
         String value = System.getenv(name);\r
         if (value == null) {\r
             value = System.getProperty(name);\r

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 (file)
--- 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;\r
 import java.util.List;\r
 import java.util.Map;\r
+import java.util.Set;\r
 import lombok.NoArgsConstructor;\r
 \r
 @NoArgsConstructor\r
@@ -54,4 +55,8 @@ public class DcaeConfigurations extends HashMap<String, Object>{
     public SecurityInfo getSubSecInfo(String key) {\r
         return this.streamsSubscribes.get(key);\r
     }\r
+\r
+    public Set<String> getSubKeys(){\r
+        return this.streamsSubscribes.keySet();\r
+    }\r
 }\r