X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2Fwrapper%2FRuleMgtWrapperTest.java;h=90384ce016e4aae37a280a92bb0841d030e41ba0;hb=abdc7bfcaf9431fd507f0e9cd7fbdb96413386cd;hp=0c81b987ce656d13e368dd418a1e7080b93d3bed;hpb=20a1514bf93035472d4f940f00a357106d4bec1f;p=holmes%2Frule-management.git

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
index 0c81b98..90384ce 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
@@ -16,37 +16,34 @@
 
 package org.onap.holmes.rulemgt.wrapper;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.onap.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;
-import org.onap.holmes.rulemgt.db.CorrelationRuleDao;
 import org.onap.holmes.common.api.entity.CorrelationRule;
 import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.common.utils.DbDaoUtil;
-import org.onap.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;
-import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest;
-import org.onap.holmes.rulemgt.bean.request.RuleDeleteRequest;
-import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;
-import org.onap.holmes.rulemgt.bean.request.RuleUpdateRequest;
+import org.onap.holmes.rulemgt.bean.request.*;
 import org.onap.holmes.rulemgt.bean.response.RuleAddAndUpdateResponse;
 import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse;
 import org.onap.holmes.rulemgt.bolt.enginebolt.EngineWrapper;
+import org.onap.holmes.rulemgt.db.CorrelationRuleDao;
 import org.onap.holmes.rulemgt.db.CorrelationRuleQueryDao;
+import org.onap.holmes.rulemgt.send.Ip4AddingRule;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.modules.junit4.rule.PowerMockRule;
 import org.powermock.reflect.Whitebox;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
 public class RuleMgtWrapperTest {
 
     @Rule
@@ -64,6 +61,8 @@ public class RuleMgtWrapperTest {
 
     private CorrelationRuleDao correlationRuleDaoMock;
 
+    private Ip4AddingRule ip4AddingRuleMock;
+
     private static final String USER_NAME = "admin";
 
     @Before
@@ -75,11 +74,13 @@ public class RuleMgtWrapperTest {
         correlationRuleQueryDaoMock = PowerMock.createMock(CorrelationRuleQueryDao.class);
         dbDaoUtilMock = PowerMock.createMock(DbDaoUtil.class);
         correlationRuleDaoMock = PowerMock.createMock(CorrelationRuleDao.class);
+        ip4AddingRuleMock = PowerMock.createMock(Ip4AddingRule.class);
 
         Whitebox.setInternalState(ruleMgtWrapper, "daoUtil", dbDaoUtilMock);
         Whitebox.setInternalState(ruleMgtWrapper, "correlationRuleQueryDao", correlationRuleQueryDaoMock);
         Whitebox.setInternalState(ruleMgtWrapper, "engineWarpper", engineWrapperMock);
         Whitebox.setInternalState(ruleMgtWrapper, "correlationRuleDao", correlationRuleDaoMock);
+        Whitebox.setInternalState(ruleMgtWrapper,"ip4AddingRule", ip4AddingRuleMock);
 
         PowerMock.resetAll();
     }
@@ -159,14 +160,18 @@ public class RuleMgtWrapperTest {
 
         RuleCreateRequest ruleCreateRequest = createRuleCreateRequest(ruleName, "This is a rule for testing.",
                 "Mocked contents.", 1);
+        ruleCreateRequest.setLoopControlName("loopName");
 
         CorrelationRule correlationRuleRet = new CorrelationRule();
         correlationRuleRet.setRid("rule_" + System.currentTimeMillis());
 
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRuleName(ruleName)).andReturn(null);
-        EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))
+        EasyMock.expect(ip4AddingRuleMock.getEngineIp4AddRule()).andReturn("10.96.33.34");
+        EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)
+                , EasyMock.anyObject(String.class)))
                 .andReturn(true);
-        EasyMock.expect(engineWrapperMock.deployEngine(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+        EasyMock.expect(engineWrapperMock.deployEngine(EasyMock.anyObject(CorrelationDeployRule4Engine.class)
+                , EasyMock.anyObject(String.class)))
                 .andReturn("package-001");
         EasyMock.expect(correlationRuleDaoMock.saveRule(EasyMock.anyObject(CorrelationRule.class)))
                 .andReturn(correlationRuleRet);
@@ -174,9 +179,9 @@ public class RuleMgtWrapperTest {
         PowerMock.replayAll();
 
         RuleAddAndUpdateResponse response = ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest);
-        assertThat(response.getRuleId(), equalTo(correlationRuleRet.getRid()));
-
         PowerMock.verifyAll();
+
+        assertThat(response.getRuleId(), equalTo(correlationRuleRet.getRid()));
     }
 
     @Test
@@ -196,15 +201,19 @@ public class RuleMgtWrapperTest {
         oldCorrelationRule.setContent("content");
         oldCorrelationRule.setPackageName("testName");
         oldCorrelationRule.setEnabled(1);
-        RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "des2", "contetnt2", 1);
+        oldCorrelationRule.setClosedControlLoopName("cl-name");
+        oldCorrelationRule.setEngineInstance("10.96.33.34");
+        RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "cl-name", "des2", "contetnt2", 1);
 
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRid("rule_1")).andReturn(oldCorrelationRule);
-        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine("testName")).andReturn(true);
+        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine("testName", "10.96.33.34")).andReturn(true);
         correlationRuleDaoMock.updateRule(EasyMock.anyObject(CorrelationRule.class));
         EasyMock.expectLastCall();
-        EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))
+        EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)
+                , EasyMock.anyObject(String.class)))
                 .andReturn(true);
-        EasyMock.expect(engineWrapperMock.deployEngine(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+        EasyMock.expect(engineWrapperMock.deployEngine(EasyMock.anyObject(CorrelationDeployRule4Engine.class)
+                , EasyMock.anyObject(String.class)))
                 .andReturn("packageName1");
         PowerMock.replayAll();
 
@@ -224,7 +233,8 @@ public class RuleMgtWrapperTest {
         oldCorrelationRule.setContent("content");
         oldCorrelationRule.setPackageName("testName");
         oldCorrelationRule.setEnabled(1);
-        RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "des1", "content", 1);
+        oldCorrelationRule.setClosedControlLoopName("cl-name");
+        RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "cl-name", "des1", "content", 1);
 
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRid("rule_1")).andReturn(oldCorrelationRule);
 
@@ -285,7 +295,8 @@ public class RuleMgtWrapperTest {
         correlationRule.setEnabled(1);
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRid(ruleDeleteRequest.getRuleId()))
                 .andReturn(correlationRule);
-        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine(EasyMock.anyObject(String.class))).andReturn(true);
+        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine(EasyMock.anyObject(String.class)
+                , EasyMock.anyObject(String.class))).andReturn(true);
         correlationRuleDaoMock.deleteRule(EasyMock.anyObject(CorrelationRule.class));
         EasyMock.expectLastCall();
         PowerMock.replayAll();
@@ -372,12 +383,14 @@ public class RuleMgtWrapperTest {
         return rcr;
     }
 
-    private RuleUpdateRequest createRuleUpdateRequest(String ruleId, String description, String content, int enabled) {
+    private RuleUpdateRequest createRuleUpdateRequest(String ruleId, String clName, String description,
+            String content, int enabled) {
         RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest();
         ruleUpdateRequest.setRuleId(ruleId);
         ruleUpdateRequest.setDescription(description);
         ruleUpdateRequest.setContent(content);
         ruleUpdateRequest.setEnabled(enabled);
+        ruleUpdateRequest.setLoopControlName(clName);
         return ruleUpdateRequest;
     }