Fix the CSIT Problem

[holmes/rule-management.git] / rulemgt / src / main / java / org / onap / holmes / rulemgt / wrapper / RuleMgtWrapper.java

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java
index c1f1917..146e034 100644 (file)
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java
@@ -73,7 +73,7 @@ public class RuleMgtWrapper {
         if (ruleTemp != null) {\r
             throw new CorrelationException("A rule with the same name already exists.");\r
         }\r
-        String packageName = deployRule2Engine(correlationRule, ruleCreateRequest.getLoopControlName());\r
+        String packageName = deployRule2Engine(correlationRule);\r
         correlationRule.setPackageName(packageName);\r
         CorrelationRule result = null;\r
         try {\r
@@ -135,7 +135,10 @@ public class RuleMgtWrapper {
         int oldEnabled = oldCorrelationRule.getEnabled();\r
         String newDes = newCorrelationRule.getDescription();\r
         String oldDes = oldCorrelationRule.getDescription();\r
-        if (newContent.equals(oldContent) && newEnabled == oldEnabled && newDes.equals(oldDes)) {\r
+        String oldControlLoop = oldCorrelationRule.getClosedControlLoopName();\r
+        String newControlLoop = newCorrelationRule.getClosedControlLoopName();\r
+        if (newContent.equals(oldContent) && newEnabled == oldEnabled\r
+                && newDes.equals(oldDes) && newControlLoop.equals(oldControlLoop)) {\r
             return false;\r
         }\r
         return true;\r
@@ -178,6 +181,7 @@ public class RuleMgtWrapper {
         correlationRule.setCreator(userName);\r
         correlationRule.setModifier(userName);\r
         correlationRule.setEnabled(ruleCreateRequest.getEnabled());\r
+        correlationRule.setClosedControlLoopName(ruleCreateRequest.getLoopControlName());\r
         return correlationRule;\r
     }\r
 \r
@@ -192,6 +196,7 @@ public class RuleMgtWrapper {
         correlationRule.setUpdateTime(new Date());\r
         correlationRule.setModifier(modifier);\r
         correlationRule.setName(ruleName);\r
+        correlationRule.setClosedControlLoopName(ruleUpdateRequest.getLoopControlName());\r
         return correlationRule;\r
     }\r
 \r
@@ -204,15 +209,6 @@ public class RuleMgtWrapper {
         return "";\r
     }\r
 \r
-    private String deployRule2Engine(CorrelationRule correlationRule, String loopControlName)\r
-            throws CorrelationException {\r
-        if (engineWarpper.checkRuleFromEngine(correlationRules2CheckRule(correlationRule)) && (\r
-                correlationRule.getEnabled() == RuleMgtConstant.STATUS_RULE_OPEN)) {\r
-            return engineWarpper.deployEngine(correlationRules2DeployRule(correlationRule, loopControlName));\r
-        }\r
-        return "";\r
-    }\r
-\r
     public RuleQueryListResponse getCorrelationRuleByCondition(\r
             RuleQueryCondition ruleQueryCondition) throws CorrelationException {\r
         List<CorrelationRule> correlationRule = correlationRuleQueryDao\r
@@ -239,6 +235,7 @@ public class RuleMgtWrapper {
             ruleResult4API.setUpdateTime(correlationRule.getUpdateTime());\r
             ruleResult4API.setModifier(correlationRule.getModifier());\r
             ruleResult4API.setEnabled(correlationRule.getEnabled());\r
+            ruleResult4API.setClosedControlLoopName(correlationRule.getClosedControlLoopName());\r
             ruleResult4APIs.add(ruleResult4API);\r
         }\r
         return ruleResult4APIs;\r
@@ -249,15 +246,7 @@ public class RuleMgtWrapper {
         CorrelationDeployRule4Engine correlationDeployRule4Engine = new CorrelationDeployRule4Engine();\r
         correlationDeployRule4Engine.setContent(correlationRule.getContent());\r
         correlationDeployRule4Engine.setEngineId(correlationRule.getEngineID());\r
-        return correlationDeployRule4Engine;\r
-    }\r
-\r
-    private CorrelationDeployRule4Engine correlationRules2DeployRule(\r
-            CorrelationRule correlationRule, String loopControlName) {\r
-        CorrelationDeployRule4Engine correlationDeployRule4Engine = new CorrelationDeployRule4Engine();\r
-        correlationDeployRule4Engine.setContent(correlationRule.getContent());\r
-        correlationDeployRule4Engine.setEngineId(correlationRule.getEngineID());\r
-        correlationDeployRule4Engine.setLoopControlName(loopControlName);\r
+        correlationDeployRule4Engine.setLoopControlName(correlationRule.getClosedControlLoopName());\r
         return correlationDeployRule4Engine;\r
     }\r
 \r