From e5e0b7b09226751d4986b1080c2bdb76cde5df4d Mon Sep 17 00:00:00 2001 From: Shiwei Tian Date: Mon, 9 Oct 2017 16:28:07 +0800 Subject: modify dace polling and loopControlName Issue-ID: HOLMES-67 Change-Id: If538c63d4ab173bd4ea0aa0bb3af8afcce24a177 Signed-off-by: Shiwei Tian --- .../org/onap/holmes/rulemgt/RuleActiveApp.java | 8 +- .../rulemgt/bean/request/RuleCreateRequest.java | 2 + .../rulemgt/dcae/DaceConfigurationPolling.java | 115 ------------------- .../rulemgt/dcae/DcaeConfigurationPolling.java | 124 +++++++++++++++++++++ .../holmes/rulemgt/wrapper/RuleMgtWrapper.java | 5 +- 5 files changed, 133 insertions(+), 121 deletions(-) delete mode 100644 rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPolling.java create mode 100644 rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java (limited to 'rulemgt/src/main') 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 a37c49c..2b8f986 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java @@ -16,8 +16,6 @@ package org.onap.holmes.rulemgt; -import static jdk.nashorn.internal.runtime.regexp.joni.Config.log; - import io.dropwizard.setup.Environment; import java.util.HashSet; import java.util.Set; @@ -29,7 +27,7 @@ import org.onap.holmes.common.config.MicroServiceConfig; import org.onap.holmes.common.dropwizard.ioc.bundle.IOCApplication; import org.onap.holmes.common.exception.CorrelationException; import org.onap.holmes.common.utils.MSBRegisterUtil; -import org.onap.holmes.rulemgt.dcae.DaceConfigurationPolling; +import org.onap.holmes.rulemgt.dcae.DcaeConfigurationPolling; import org.onap.holmes.rulemgt.resources.RuleMgtResources; import org.onap.msb.sdk.discovery.entity.MicroServiceInfo; import org.onap.msb.sdk.discovery.entity.Node; @@ -51,8 +49,8 @@ public class RuleActiveApp extends IOCApplication { super.run(configuration, environment); ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor(); - service.scheduleAtFixedRate(new DaceConfigurationPolling("holmes-rule-mgmt"), 0, - DaceConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS); + service.scheduleAtFixedRate(new DcaeConfigurationPolling("holmes-rule-mgmt"), 0, + DcaeConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS); environment.jersey().register(new RuleMgtResources()); try { diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleCreateRequest.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleCreateRequest.java index f090c3b..c7e8a6f 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleCreateRequest.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleCreateRequest.java @@ -24,6 +24,8 @@ import lombok.Setter; public class RuleCreateRequest { @JsonProperty(value = "rulename") private String ruleName; + @JsonProperty(value = "loopcontrolname") + private String loopControlName; @JsonProperty private String description; @JsonProperty diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPolling.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPolling.java deleted file mode 100644 index 0527881..0000000 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPolling.java +++ /dev/null @@ -1,115 +0,0 @@ -/** - * Copyright 2017 ZTE Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.onap.holmes.rulemgt.dcae; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import java.util.List; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -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.entity.DcaeConfigurations; -import org.onap.holmes.common.dcae.entity.Rule; -import org.onap.holmes.common.dcae.utils.DcaeConfigurationParser; -import org.onap.holmes.common.exception.CorrelationException; -import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest; -import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse; -import org.onap.holmes.rulemgt.bean.response.RuleResult4API; - -@Slf4j -public class DaceConfigurationPolling implements Runnable { - - public static long POLLING_PERIOD = 10 * 1000; - - private String hostname; - - private String url = "http://127.0.0.1/api/holmes-rule-mgmt/v1/rule"; - - public DaceConfigurationPolling(String hostname) { - this.hostname = hostname; - } - - @Override - public void run() { - DcaeConfigurations dcaeConfigurations = null; - try { - dcaeConfigurations = getDcaeConfigurations(); - } catch (CorrelationException e) { - log.error("Failed to polling dcae configurations" + e.getMessage()); - } - if (dcaeConfigurations != null) { - RuleQueryListResponse ruleQueryListResponse = getAllCorrelationRules(); - List ruleResult4APIs = ruleQueryListResponse.getCorrelationRules(); - deleteAllCorrelationRules(ruleResult4APIs); - try { - addAllCorrelationRules(dcaeConfigurations); - } catch (CorrelationException e) { - log.error("Failed to add rules" + e.getMessage()); - } - } - } - - private DcaeConfigurations getDcaeConfigurations() throws CorrelationException { - String serviceAddrInfo = MicroServiceConfig.getServiceAddrInfoFromCBS(hostname); - DcaeConfigurations dcaeConfigurations = null; - dcaeConfigurations = DcaeConfigurationParser.parse(serviceAddrInfo); - return dcaeConfigurations; - } - - private RuleQueryListResponse getAllCorrelationRules() { - Client client = ClientBuilder.newClient(new ClientConfig()); - WebTarget webTarget = client.target(url); - return webTarget.request("application/json").get() - .readEntity(RuleQueryListResponse.class); - } - - private void addAllCorrelationRules(DcaeConfigurations dcaeConfigurations) throws CorrelationException { - for (Rule rule : dcaeConfigurations.getDefaultRules()) { - RuleCreateRequest ruleCreateRequest = getRuleCreateRequest(rule); - Client client = ClientBuilder.newClient(new ClientConfig()); - ObjectMapper mapper = new ObjectMapper(); - String content = null; - try { - content = mapper.writeValueAsString(ruleCreateRequest); - } catch (JsonProcessingException e) { - throw new CorrelationException("Failed to convert the message object to a json string.", e); - } - WebTarget webTarget = client.target(url); - webTarget.request(MediaType.APPLICATION_JSON) - .put(Entity.entity(content, MediaType.APPLICATION_JSON)); - } - } - - private void deleteAllCorrelationRules(List ruleResult4APIs){ - ruleResult4APIs.forEach(correlationRule ->{ - Client client = ClientBuilder.newClient(new ClientConfig()); - WebTarget webTarget = client.target(url + "/" + correlationRule.getRuleId()); - webTarget.request(MediaType.APPLICATION_JSON).delete(); - }); - } - - private RuleCreateRequest getRuleCreateRequest(Rule rule) { - RuleCreateRequest ruleCreateRequest = new RuleCreateRequest(); - ruleCreateRequest.setRuleName(rule.getName()); - ruleCreateRequest.setContent(rule.getContents()); - ruleCreateRequest.setDescription(""); - ruleCreateRequest.setEnabled(1); - return ruleCreateRequest; - } -} 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 new file mode 100644 index 0000000..a69b6a4 --- /dev/null +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java @@ -0,0 +1,124 @@ +/** + * Copyright 2017 ZTE Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.onap.holmes.rulemgt.dcae; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.List; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +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.entity.DcaeConfigurations; +import org.onap.holmes.common.dcae.entity.Rule; +import org.onap.holmes.common.dcae.utils.DcaeConfigurationParser; +import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest; +import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse; +import org.onap.holmes.rulemgt.bean.response.RuleResult4API; + +@Slf4j +public class DcaeConfigurationPolling implements Runnable { + + public static long POLLING_PERIOD = 10 * 1000L; + + private String hostname; + + private String url = "http://127.0.0.1/api/holmes-rule-mgmt/v1/rule"; + + public DcaeConfigurationPolling(String hostname) { + this.hostname = hostname; + } + + @Override + public void run() { + DcaeConfigurations dcaeConfigurations = null; + try { + dcaeConfigurations = getDcaeConfigurations(); + } catch (CorrelationException e) { + log.error("Failed to polling dcae configurations" + e.getMessage()); + } + if (dcaeConfigurations != null) { + RuleQueryListResponse ruleQueryListResponse = getAllCorrelationRules(); + List ruleResult4APIs = ruleQueryListResponse.getCorrelationRules(); + deleteAllCorrelationRules(ruleResult4APIs); + try { + addAllCorrelationRules(dcaeConfigurations); + } catch (CorrelationException e) { + log.error("Failed to add rules" + e.getMessage()); + } + } + } + + 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); + return webTarget.request("application/json").get() + .readEntity(RuleQueryListResponse.class); + } + + private void addAllCorrelationRules(DcaeConfigurations dcaeConfigurations) throws CorrelationException { + for (Rule rule : dcaeConfigurations.getDefaultRules()) { + RuleCreateRequest ruleCreateRequest = getRuleCreateRequest(rule); + Client client = ClientBuilder.newClient(new ClientConfig()); + ObjectMapper mapper = new ObjectMapper(); + String content = null; + try { + content = mapper.writeValueAsString(ruleCreateRequest); + } catch (JsonProcessingException e) { + throw new CorrelationException("Failed to convert the message object to a json string.", e); + } + WebTarget webTarget = client.target(url); + webTarget.request(MediaType.APPLICATION_JSON) + .put(Entity.entity(content, MediaType.APPLICATION_JSON)); + } + } + + private void deleteAllCorrelationRules(List ruleResult4APIs){ + ruleResult4APIs.forEach(correlationRule ->{ + Client client = ClientBuilder.newClient(new ClientConfig()); + WebTarget webTarget = client.target(url + "/" + correlationRule.getRuleId()); + webTarget.request(MediaType.APPLICATION_JSON).delete(); + }); + } + + private RuleCreateRequest getRuleCreateRequest(Rule rule) { + RuleCreateRequest ruleCreateRequest = new RuleCreateRequest(); + ruleCreateRequest.setLoopControlName(rule.getLoopControlName()); + ruleCreateRequest.setRuleName(rule.getName()); + ruleCreateRequest.setContent(rule.getContents()); + ruleCreateRequest.setDescription(""); + ruleCreateRequest.setEnabled(1); + return ruleCreateRequest; + } +} diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java index beffa56..856171b 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java @@ -23,6 +23,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import org.jvnet.hk2.annotations.Service; +import org.onap.holmes.common.dmaap.DmaapService; import org.onap.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine; import org.onap.holmes.rulemgt.bean.response.RuleResult4API; import org.onap.holmes.rulemgt.constant.RuleMgtConstant; @@ -72,7 +73,9 @@ public class RuleMgtWrapper { if (ruleTemp != null) { throw new CorrelationException("A rule with the same name already exists."); } - correlationRule.setPackageName(deployRule2Engine(correlationRule)); + String packageName = deployRule2Engine(correlationRule); + DmaapService.loopControlNames.put(packageName, ruleCreateRequest.getLoopControlName()); + correlationRule.setPackageName(packageName); CorrelationRule result = correlationRuleDao.saveRule(correlationRule); RuleAddAndUpdateResponse ruleAddAndUpdateResponse = new RuleAddAndUpdateResponse(); ruleAddAndUpdateResponse.setRuleId(result.getRid()); -- cgit