From 126cfb2bef37fff35e6c1e3f3c7b03787fd923d8 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Wed, 8 Nov 2017 12:35:22 +0800 Subject: [PATCH] Add the MD5 Check to Avoid Duplicated Deployment Change-Id: I99d234c81e1aa9ae947e4661b8a05e5dd6c2a60c Issue-ID: HOLMES-86 Signed-off-by: Guangrong Fu --- .../onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java index 95b28b6..493011c 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java @@ -29,6 +29,7 @@ import org.onap.holmes.common.dcae.entity.DcaeConfigurations; import org.onap.holmes.common.dcae.entity.Rule; import org.onap.holmes.common.dcae.utils.DcaeConfigurationParser; import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.common.utils.Md5Util; import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest; import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse; import org.onap.holmes.rulemgt.bean.response.RuleResult4API; @@ -46,13 +47,23 @@ public class DcaeConfigurationPolling implements Runnable { this.hostname = hostname; } + private String prevConfigMd5 = Md5Util.md5(null); + @Override public void run() { DcaeConfigurations dcaeConfigurations = null; try { dcaeConfigurations = DcaeConfigurationQuery.getDcaeConfigurations(hostname); + String md5 = Md5Util.md5(dcaeConfigurations); + if (prevConfigMd5.equals(md5)){ + log.info("Operation aborted due to identical Configurations."); + return; + } + prevConfigMd5 = md5; } catch (CorrelationException e) { log.error("Failed to fetch DCAE configurations. " + e.getMessage(), e); + } catch (JsonProcessingException e) { + log.info("Failed to generate the MD5 information for new configurations.", e); } if (dcaeConfigurations != null) { RuleQueryListResponse ruleQueryListResponse = getAllCorrelationRules(); @@ -61,7 +72,7 @@ public class DcaeConfigurationPolling implements Runnable { try { addAllCorrelationRules(dcaeConfigurations); } catch (CorrelationException e) { - log.error("Failed to add rules. " + e.getMessage()); + log.error("Failed to add rules. " + e.getMessage(), e); } } } -- 2.16.6