diff options
author | Shiwei Tian <tian.shiwei@zte.com.cn> | 2017-10-14 11:06:27 +0800 |
---|---|---|
committer | Shiwei Tian <tian.shiwei@zte.com.cn> | 2017-10-14 11:06:27 +0800 |
commit | 049c1722681a7c0d564d625f2740cbc47c15a4be (patch) | |
tree | 505dee221b1fb2236cec3e9f754b7bc59c48b2cb /rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java | |
parent | 646a660b1a7828013006619b4f7ec2d2f2f02f36 (diff) |
modify control loop name
Issue-ID: HOLMES-67
Change-Id: Ifa7f463855d598350c81c2aa82cce254dccba213
Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>
Diffstat (limited to 'rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java')
-rw-r--r-- | rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java index 1cc31d8..c9fdb70 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java @@ -24,6 +24,7 @@ import javax.ws.rs.core.MediaType; import lombok.extern.slf4j.Slf4j; import org.glassfish.jersey.client.ClientConfig; import org.onap.holmes.common.config.MicroServiceConfig; +import org.onap.holmes.common.dcae.DcaeConfigurationQuery; import org.onap.holmes.common.dcae.entity.DcaeConfigurations; import org.onap.holmes.common.dcae.entity.Rule; import org.onap.holmes.common.dcae.utils.DcaeConfigurationParser; @@ -49,7 +50,7 @@ public class DcaeConfigurationPolling implements Runnable { public void run() { DcaeConfigurations dcaeConfigurations = null; try { - dcaeConfigurations = getDcaeConfigurations(); + dcaeConfigurations = DcaeConfigurationQuery.getDcaeConfigurations(hostname); } catch (CorrelationException e) { log.error("Failed to fetch DCAE configurations" + e.getMessage()); } @@ -65,21 +66,6 @@ public class DcaeConfigurationPolling implements Runnable { } } - private DcaeConfigurations getDcaeConfigurations() throws CorrelationException { - String serviceAddrInfo = MicroServiceConfig.getServiceAddrInfoFromCBS(hostname); - String response = getDcaeResponse(serviceAddrInfo); - DcaeConfigurations dcaeConfigurations = null; - dcaeConfigurations = DcaeConfigurationParser.parse(response); - return dcaeConfigurations; - } - - private String getDcaeResponse(String serviceAddrInfo) { - Client client = ClientBuilder.newClient(new ClientConfig()); - WebTarget webTarget = client.target(serviceAddrInfo); - return webTarget.request("application/json").get() - .readEntity(String.class); - } - private RuleQueryListResponse getAllCorrelationRules() { Client client = ClientBuilder.newClient(new ClientConfig()); WebTarget webTarget = client.target(url); |