Code Review
/
holmes
/
rule-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add the MD5 Check to Avoid Duplicated Deployment
[holmes/rule-management.git]
/
rulemgt
/
src
/
main
/
java
/
org
/
onap
/
holmes
/
rulemgt
/
dcae
/
DcaeConfigurationPolling.java
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
c9fdb70
..
493011c
100644
(file)
--- 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.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;
import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest;
import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse;
import org.onap.holmes.rulemgt.bean.response.RuleResult4API;
@@
-36,23
+37,33
@@
import org.onap.holmes.rulemgt.bean.response.RuleResult4API;
@Slf4j
public class DcaeConfigurationPolling implements Runnable {
@Slf4j
public class DcaeConfigurationPolling implements Runnable {
- public static long POLLING_PERIOD =
1
0 * 1000L;
+ public static long POLLING_PERIOD =
3
0 * 1000L;
private String hostname;
private String hostname;
- private String url = "http://127.0.0.1/api/holmes-rule-mgmt/v1/rule";
+ private String url = "http://127.0.0.1
:9101
/api/holmes-rule-mgmt/v1/rule";
public DcaeConfigurationPolling(String hostname) {
this.hostname = hostname;
}
public DcaeConfigurationPolling(String hostname) {
this.hostname = hostname;
}
+ private String prevConfigMd5 = Md5Util.md5(null);
+
@Override
public void run() {
DcaeConfigurations dcaeConfigurations = null;
try {
dcaeConfigurations = DcaeConfigurationQuery.getDcaeConfigurations(hostname);
@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) {
} catch (CorrelationException e) {
- log.error("Failed to fetch DCAE configurations" + e.getMessage());
+ 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();
}
if (dcaeConfigurations != null) {
RuleQueryListResponse ruleQueryListResponse = getAllCorrelationRules();
@@
-61,7
+72,7
@@
public class DcaeConfigurationPolling implements Runnable {
try {
addAllCorrelationRules(dcaeConfigurations);
} catch (CorrelationException e) {
try {
addAllCorrelationRules(dcaeConfigurations);
} catch (CorrelationException e) {
- log.error("Failed to add rules
" + e.getMessage()
);
+ log.error("Failed to add rules
. " + e.getMessage(), e
);
}
}
}
}
}
}