From 3893b89844f0e76d1a80c578216c4320fac65ed9 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Fri, 3 Nov 2017 14:23:41 +0800 Subject: Modify the Service Addr Query Logic Change-Id: Ieac7058fc69aa5f6a7b296564e4266f4a5399e7f Issue-ID: HOLMES-81 Signed-off-by: Guangrong Fu --- rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java | 2 +- .../java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java | 6 +++--- .../org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java index 01fde48..7738366 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java @@ -61,7 +61,7 @@ public class RuleActiveApp extends IOCApplication { } private MicroServiceInfo createMicroServiceInfo() { - String[] serviceAddrInfo = MicroServiceConfig.getServiceAddrInfo(); + String[] serviceAddrInfo = MicroServiceConfig.getMicroServiceIpAndPort(); MicroServiceInfo msinfo = new MicroServiceInfo(); msinfo.setServiceName("holmes-rule-mgmt"); msinfo.setVersion("v1"); diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java index f3e8d5c..5dc97b4 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java @@ -38,7 +38,7 @@ public class EngineService { protected Response delete(String packageName) throws IOException { Client client = createClient(); WebTarget webTarget = client - .target(MicroServiceConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH + "/" + packageName); + .target(MicroServiceConfig.getMsbServerAddrWithHttpPrefix() + RuleMgtConstant.ENGINE_PATH + "/" + packageName); return webTarget.request(MediaType.APPLICATION_JSON).delete(); } @@ -52,7 +52,7 @@ public class EngineService { Client client = createClient(); ObjectMapper mapper = new ObjectMapper(); String content = mapper.writeValueAsString(correlationCheckRule4Engine); - WebTarget webTarget = client.target(MicroServiceConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH); + WebTarget webTarget = client.target(MicroServiceConfig.getMsbServerAddrWithHttpPrefix() + RuleMgtConstant.ENGINE_PATH); return webTarget.request(MediaType.APPLICATION_JSON).post(Entity.entity(content, MediaType.APPLICATION_JSON)); } @@ -60,7 +60,7 @@ public class EngineService { Client client = createClient(); ObjectMapper mapper = new ObjectMapper(); String content = mapper.writeValueAsString(correlationDeployRule4Engine); - WebTarget webTarget = client.target(MicroServiceConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH); + WebTarget webTarget = client.target(MicroServiceConfig.getMsbServerAddrWithHttpPrefix() + RuleMgtConstant.ENGINE_PATH); return webTarget.request(MediaType.APPLICATION_JSON).put(Entity.entity(content, MediaType.APPLICATION_JSON)); } } diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java index 25e211a..a330306 100644 --- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java +++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java @@ -59,7 +59,7 @@ public class DcaeConfigurationPollingTest { thrown.expect(CorrelationException.class); thrown.expectMessage("host"); PowerMockito.mockStatic(MicroServiceConfig.class); - when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt")) + when(MicroServiceConfig.getServiceConfigInfoFromCBS("holmes-rule-mgmt")) .thenReturn("host"); PowerMock.createMock(DcaeConfigurationParser.class); PowerMock.expectPrivate(DcaeConfigurationParser.class, "parse", "host") @@ -75,7 +75,7 @@ public class DcaeConfigurationPollingTest { PowerMock.resetAll(); thrown.expect(CorrelationException.class); PowerMockito.mockStatic(MicroServiceConfig.class); - when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt")) + when(MicroServiceConfig.getServiceConfigInfoFromCBS("holmes-rule-mgmt")) .thenReturn("host"); PowerMock.createMock(DcaeConfigurationParser.class); PowerMock.expectPrivate(DcaeConfigurationParser.class, "parse", "host") -- cgit 1.2.3-korg