X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2Fdcae%2FDcaeConfigurationPolling.java;h=97da7ee1a2855f2f770de2cad9f4d637d71839b8;hb=54c2f258c7e991cb3b5ea7753f48aab6fdf04261;hp=1cc31d8227bda07d482eb2ab23cd8c95d2ce8dcc;hpb=f067dcfc723d4494d84311528b2370196d3691a6;p=holmes%2Frule-management.git

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 1cc31d8..97da7ee 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
@@ -14,20 +14,21 @@
 package org.onap.holmes.rulemgt.dcae;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.glassfish.jersey.client.ClientConfig;
-import org.onap.holmes.common.config.MicroServiceConfig;
+import org.onap.holmes.common.dcae.DcaeConfigurationQuery;
 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.JacksonUtil;
+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;
@@ -35,51 +36,50 @@ import org.onap.holmes.rulemgt.bean.response.RuleResult4API;
 @Slf4j
 public class DcaeConfigurationPolling implements Runnable {
 
-    public static long POLLING_PERIOD = 10 * 1000L;
+    public static long POLLING_PERIOD = 30 * 1000L;
 
     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;
     }
 
+    private String prevConfigMd5 = Md5Util.md5(null);
+
+    private boolean prevResult = false;
+
     @Override
     public void run() {
         DcaeConfigurations dcaeConfigurations = null;
         try {
-            dcaeConfigurations = getDcaeConfigurations();
+            dcaeConfigurations = DcaeConfigurationQuery.getDcaeConfigurations(hostname);
+            String md5 = Md5Util.md5(dcaeConfigurations);
+            if (prevResult && prevConfigMd5.equals(md5)){
+                log.info("Operation aborted due to identical Configurations.");
+                return;
+            }
+            prevConfigMd5 = md5;
+            prevResult = false;
         } 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();
             List<RuleResult4API> ruleResult4APIs = ruleQueryListResponse.getCorrelationRules();
             deleteAllCorrelationRules(ruleResult4APIs);
             try {
-                addAllCorrelationRules(dcaeConfigurations);
+                prevResult = addAllCorrelationRules(dcaeConfigurations);
             } catch (CorrelationException e) {
-                log.error("Failed to add rules" + e.getMessage());
+                log.error("Failed to add rules. " + e.getMessage(), e);
+                prevResult = false;
             }
         }
     }
 
-    private DcaeConfigurations getDcaeConfigurations() throws CorrelationException {
-        String serviceAddrInfo = MicroServiceConfig.getServiceAddrInfoFromCBS(hostname);
-        String response = getDcaeResponse(serviceAddrInfo);
-        DcaeConfigurations dcaeConfigurations = null;
-        dcaeConfigurations = DcaeConfigurationParser.parse(response);
-        return dcaeConfigurations;
-    }
-
-    private String getDcaeResponse(String serviceAddrInfo) {
-        Client client = ClientBuilder.newClient(new ClientConfig());
-        WebTarget webTarget = client.target(serviceAddrInfo);
-        return webTarget.request("application/json").get()
-                .readEntity(String.class);
-    }
-
     private RuleQueryListResponse getAllCorrelationRules() {
         Client client = ClientBuilder.newClient(new ClientConfig());
         WebTarget webTarget = client.target(url);
@@ -87,21 +87,26 @@ public class DcaeConfigurationPolling implements Runnable {
                 .readEntity(RuleQueryListResponse.class);
     }
 
-    private void addAllCorrelationRules(DcaeConfigurations dcaeConfigurations) throws CorrelationException {
+    private boolean addAllCorrelationRules(DcaeConfigurations dcaeConfigurations) throws CorrelationException {
+        boolean suc = false;
         for (Rule rule : dcaeConfigurations.getDefaultRules()) {
             RuleCreateRequest ruleCreateRequest = getRuleCreateRequest(rule);
             Client client = ClientBuilder.newClient(new ClientConfig());
-            ObjectMapper mapper = new ObjectMapper();
             String content = null;
             try {
-                content = mapper.writeValueAsString(ruleCreateRequest);
+                content = JacksonUtil.beanToJson(ruleCreateRequest);
             } catch (JsonProcessingException e) {
                 throw new CorrelationException("Failed to convert the message object to a json string.", e);
             }
             WebTarget webTarget = client.target(url);
-            webTarget.request(MediaType.APPLICATION_JSON)
+            Response response = webTarget.request(MediaType.APPLICATION_JSON)
                     .put(Entity.entity(content, MediaType.APPLICATION_JSON));
+            suc = response.getStatus() == 200;
+            if (!suc) {
+                break;
+            }
         }
+        return suc;
     }
 
     private void deleteAllCorrelationRules(List<RuleResult4API> ruleResult4APIs){