summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rulemgt-standalone/src/main/assembly/conf/rulemgt.yml2
-rw-r--r--rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java18
-rw-r--r--rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java6
-rw-r--r--rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleQueryWrapperTest.java2
4 files changed, 14 insertions, 14 deletions
diff --git a/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml b/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
index ca857a1..812d337 100644
--- 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
--- 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(""));
PowerMock.replayAll();
- engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");
+ engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"127.0.0.1");
PowerMock.verifyAll();
}
@@ -87,7 +87,7 @@ public class EngineWrapperTest {
EasyMock.expect(statusLineMock.getStatusCode()).andReturn(400);
PowerMock.replayAll();
- engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");
+ engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"127.0.0.1");
PowerMock.verifyAll();
}
@@ -109,7 +109,7 @@ public class EngineWrapperTest {
EasyMock.expect(HttpsUtils.extractResponseEntity(httpResponse)).andReturn(content);
PowerMock.replayAll();
- engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");
+ engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"127.0.0.1");
PowerMock.verifyAll();
}
@@ -128,7 +128,7 @@ public class EngineWrapperTest {
EasyMock.expect(HttpsUtils.extractResponseEntity(httpResponse)).andReturn(content);
PowerMock.replayAll();
- String result = engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");
+ String result = engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"127.0.0.1");
assertThat(result, equalTo("test"));
@@ -144,7 +144,7 @@ public class EngineWrapperTest {
new RuntimeException(""));
PowerMock.replayAll();
- engineWrapper.deleteRuleFromEngine("","10.96.33.34");
+ engineWrapper.deleteRuleFromEngine("","127.0.0.1");
PowerMock.verifyAll();
}
@@ -162,7 +162,7 @@ public class EngineWrapperTest {
PowerMock.replayAll();
- engineWrapper.deleteRuleFromEngine("","10.96.33.34");
+ engineWrapper.deleteRuleFromEngine("","127.0.0.1");
PowerMock.verifyAll();
}
@@ -177,7 +177,7 @@ public class EngineWrapperTest {
PowerMock.replayAll();
- boolean result = engineWrapper.deleteRuleFromEngine("","10.96.33.34");
+ boolean result = engineWrapper.deleteRuleFromEngine("","127.0.0.1");
assertThat(result, equalTo(true));
}
@@ -194,7 +194,7 @@ public class EngineWrapperTest {
new RuntimeException(""));
PowerMock.replayAll();
- engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"10.96.33.34");
+ engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"127.0.0.1");
PowerMock.verifyAll();
}
@@ -210,7 +210,7 @@ public class EngineWrapperTest {
PowerMock.replayAll();
- boolean result = engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"10.96.33.34");
+ boolean result = engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"127.0.0.1");
assertThat(result, equalTo(true));
}
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
--- 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());
EasyMock.expect(correlationRuleDaoMock.queryRuleByRuleName(ruleName)).andReturn(null);
- EasyMock.expect(engineToolsMock.getEngineWithLeastRules()).andReturn("10.96.33.34");
+ EasyMock.expect(engineToolsMock.getEngineWithLeastRules()).andReturn("127.0.0.1");
EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)
, EasyMock.anyObject(String.class)))
.andReturn(true);
@@ -202,11 +202,11 @@ public class RuleMgtWrapperTest {
oldCorrelationRule.setPackageName("testName");
oldCorrelationRule.setEnabled(1);
oldCorrelationRule.setClosedControlLoopName("cl-name");
- oldCorrelationRule.setEngineInstance("10.96.33.34");
+ oldCorrelationRule.setEngineInstance("127.0.0.1");
RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "cl-name", "des2", "contetnt2", 1);
EasyMock.expect(correlationRuleDaoMock.queryRuleByRid("rule_1")).andReturn(oldCorrelationRule);
- EasyMock.expect(engineWrapperMock.deleteRuleFromEngine("testName", "10.96.33.34")).andReturn(true);
+ EasyMock.expect(engineWrapperMock.deleteRuleFromEngine("testName", "127.0.0.1")).andReturn(true);
correlationRuleDaoMock.updateRule(EasyMock.anyObject(CorrelationRule.class));
EasyMock.expectLastCall();
EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)
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
--- 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);