summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangrong Fu <fu.guangrong@zte.com.cn>2017-11-01 23:53:23 +0800
committerGuangrong Fu <fu.guangrong@zte.com.cn>2017-11-02 12:17:58 +0800
commitc8e4878d4f519e63a81bd30b30fcba0a0b398eb5 (patch)
treec1308f74afd5caf1f8aa004d3260f5d88d7f8114
parentd30677e80b8756048f9633ecba4c26360e3f644c (diff)
Change the "Target" to vserver-name
Change-Id: I15e211e5718c3440e2395b12293b8d42a019fe00 Issue-ID: HOLMES-83 Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java2
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
index 300201f..738bfd9 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
@@ -71,7 +71,6 @@ public class DmaapService {
if (rootAlarm.getAlarmIsCleared() == PolicyMassgeConstant.POLICY_MESSAGE_ONSET) {
enrichVnfInfo(vmEntity, childAlarm, policyMsg);
policyMsg.setClosedLoopEventStatus(EVENT_STATUS.ONSET);
- policyMsg.setTarget("vserver.vserver-id");
policyMsg.getAai().put("vserver.in-maint", String.valueOf(vmEntity.getInMaint()));
policyMsg.getAai().put("vserver.is-closed-loop-disabled",
String.valueOf(vmEntity.getClosedLoopDisable()));
@@ -87,6 +86,7 @@ public class DmaapService {
policyMsg.getAai().put("vserver.vserver-name", vmEntity.getVserverName());
policyMsg.getAai().put("vserver.vserver-name2", vmEntity.getVserverName2());
policyMsg.getAai().put("vserver.vserver-selflink", vmEntity.getVserverSelflink());
+ policyMsg.setTarget("vserver.vserver-name");
return policyMsg;
}
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java
index 72e27db..0c93c42 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java
@@ -20,7 +20,6 @@ import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;