Remove IP addresses

Change-Id: Ib641a153de2704a936d9755150d234004f1f2b4f
Issue-ID: HOLMES-425
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml b/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
index ca857a1..812d337 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
+++ b/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
@@ -56,7 +56,7 @@ database:
   driverClass: org.postgresql.Driver
   user: holmes
   password: holmespwd
-  url: jdbc:postgresql://10.96.33.33:5432/holmes
+  url: jdbc:postgresql://127.0.0.1:5432/holmes
   properties:
     charSet: UTF-8
   maxWaitForConnection: 1s

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
index 0dd2fbd..7296824 100644 (file)
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
@@ -69,7 +69,7 @@ public class EngineWrapperTest {
                         new RuntimeException(""));\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");\r
+        engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"127.0.0.1");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -87,7 +87,7 @@ public class EngineWrapperTest {
         EasyMock.expect(statusLineMock.getStatusCode()).andReturn(400);\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");\r
+        engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"127.0.0.1");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -109,7 +109,7 @@ public class EngineWrapperTest {
         EasyMock.expect(HttpsUtils.extractResponseEntity(httpResponse)).andReturn(content);\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");\r
+        engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"127.0.0.1");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -128,7 +128,7 @@ public class EngineWrapperTest {
         EasyMock.expect(HttpsUtils.extractResponseEntity(httpResponse)).andReturn(content);\r
         PowerMock.replayAll();\r
 \r
-        String result = engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");\r
+        String result = engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"127.0.0.1");\r
 \r
         assertThat(result, equalTo("test"));\r
 \r
@@ -144,7 +144,7 @@ public class EngineWrapperTest {
                 new RuntimeException(""));\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deleteRuleFromEngine("","10.96.33.34");\r
+        engineWrapper.deleteRuleFromEngine("","127.0.0.1");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -162,7 +162,7 @@ public class EngineWrapperTest {
 \r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deleteRuleFromEngine("","10.96.33.34");\r
+        engineWrapper.deleteRuleFromEngine("","127.0.0.1");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -177,7 +177,7 @@ public class EngineWrapperTest {
 \r
         PowerMock.replayAll();\r
 \r
-        boolean result = engineWrapper.deleteRuleFromEngine("","10.96.33.34");\r
+        boolean result = engineWrapper.deleteRuleFromEngine("","127.0.0.1");\r
 \r
         assertThat(result, equalTo(true));\r
     }\r
@@ -194,7 +194,7 @@ public class EngineWrapperTest {
                         new RuntimeException(""));\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"10.96.33.34");\r
+        engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"127.0.0.1");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -210,7 +210,7 @@ public class EngineWrapperTest {
 \r
         PowerMock.replayAll();\r
 \r
-        boolean result = engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"10.96.33.34");\r
+        boolean result = engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"127.0.0.1");\r
 \r
         assertThat(result, equalTo(true));\r
     }\r

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 ef26936..2a8357c 100644 (file)
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
@@ -166,7 +166,7 @@ public class RuleMgtWrapperTest {
         correlationRuleRet.setRid("rule_" + System.currentTimeMillis());\r
 \r
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRuleName(ruleName)).andReturn(null);\r
-        EasyMock.expect(engineToolsMock.getEngineWithLeastRules()).andReturn("10.96.33.34");\r
+        EasyMock.expect(engineToolsMock.getEngineWithLeastRules()).andReturn("127.0.0.1");\r
         EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)\r
                 , EasyMock.anyObject(String.class)))\r
                 .andReturn(true);\r
@@ -202,11 +202,11 @@ public class RuleMgtWrapperTest {
         oldCorrelationRule.setPackageName("testName");\r
         oldCorrelationRule.setEnabled(1);\r
         oldCorrelationRule.setClosedControlLoopName("cl-name");\r
-        oldCorrelationRule.setEngineInstance("10.96.33.34");\r
+        oldCorrelationRule.setEngineInstance("127.0.0.1");\r
         RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "cl-name", "des2", "contetnt2", 1);\r
 \r
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRid("rule_1")).andReturn(oldCorrelationRule);\r
-        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine("testName", "10.96.33.34")).andReturn(true);\r
+        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine("testName", "127.0.0.1")).andReturn(true);\r
         correlationRuleDaoMock.updateRule(EasyMock.anyObject(CorrelationRule.class));\r
         EasyMock.expectLastCall();\r
         EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)\r

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleQueryWrapperTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleQueryWrapperTest.java
index b07efe9..4c7b1a0 100644 (file)
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleQueryWrapperTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleQueryWrapperTest.java
@@ -51,7 +51,7 @@ public class RuleQueryWrapperTest {
 
     @Test
     public void queryRuleByEngineInstance() throws Exception{
-        String engineInstance = "10.96.33.34";
+        String engineInstance = "127.0.0.1";
         EasyMock.expect(ruleQueryWrapper.queryRuleByEngineInstance(EasyMock.anyObject(String.class))).andReturn(new ArrayList<CorrelationRule>());
         PowerMock.replayAll();
         List<CorrelationRule> correlationRules = ruleQueryWrapper.queryRuleByEngineInstance(engineInstance);