summaryrefslogtreecommitdiffstats
path: root/rulemgt
diff options
context:
space:
mode:
authorShiwei Tian <tian.shiwei@zte.com.cn>2017-09-25 15:31:32 +0800
committerShiwei Tian <tian.shiwei@zte.com.cn>2017-09-26 17:14:53 +0800
commita3aa5d702e9781a03083338ea70a2fe4b15c067f (patch)
tree287292423f20359859eed9feadca0aaae7263cb5 /rulemgt
parent7240916c59ad2b1220b1fb8e79925995c699cc56 (diff)
add polling rule task
Issue-ID: HOLMES-56 Change-Id: I842ead880777b76da013834e5a25e10b0d8834bf Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>
Diffstat (limited to 'rulemgt')
-rw-r--r--rulemgt/pom.xml6
-rw-r--r--rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java8
-rw-r--r--rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPolling.java115
-rw-r--r--rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPollingTest.java138
-rw-r--r--rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java4
5 files changed, 269 insertions, 2 deletions
diff --git a/rulemgt/pom.xml b/rulemgt/pom.xml
index 013105b..5b2a11a 100644
--- a/rulemgt/pom.xml
+++ b/rulemgt/pom.xml
@@ -120,6 +120,12 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>1.7.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-rule</artifactId>
<version>1.6.5</version>
<scope>test</scope>
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 003c7fb..a37c49c 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
@@ -21,11 +21,15 @@ import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
import io.dropwizard.setup.Environment;
import java.util.HashSet;
import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
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.resources.RuleMgtResources;
import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
import org.onap.msb.sdk.discovery.entity.Node;
@@ -46,6 +50,10 @@ public class RuleActiveApp extends IOCApplication<RuleAppConfig> {
public void run(RuleAppConfig configuration, Environment environment) throws Exception {
super.run(configuration, environment);
+ ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
+ service.scheduleAtFixedRate(new DaceConfigurationPolling("holmes-rule-mgmt"), 0,
+ DaceConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS);
+
environment.jersey().register(new RuleMgtResources());
try {
new MSBRegisterUtil().register2Msb(createMicroServiceInfo());
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
new file mode 100644
index 0000000..0527881
--- /dev/null
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPolling.java
@@ -0,0 +1,115 @@
+/**
+ * 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<RuleResult4API> 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<RuleResult4API> 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/test/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPollingTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPollingTest.java
new file mode 100644
index 0000000..b9d9abb
--- /dev/null
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPollingTest.java
@@ -0,0 +1,138 @@
+/**
+ * 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 static org.easymock.EasyMock.anyObject;
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.ArrayList;
+import java.util.List;
+import javax.ws.rs.ProcessingException;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+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;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+
+@PrepareForTest({DaceConfigurationPolling.class, MicroServiceConfig.class, ObjectMapper.class})
+@RunWith(PowerMockRunner.class)
+public class DaceConfigurationPollingTest {
+
+ @org.junit.Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ private DaceConfigurationPolling daceConfigurationPolling;
+
+ @Before
+ public void setUp() {
+ daceConfigurationPolling = new DaceConfigurationPolling("holmes-rule-mgmt");
+ }
+
+ @Test
+ public void testDaceConfigurationPolling_getDcaeConfigurations_exception() throws Exception {
+ PowerMock.resetAll();
+ thrown.expect(CorrelationException.class);
+ thrown.expectMessage("host");
+ PowerMockito.mockStatic(MicroServiceConfig.class);
+ when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt"))
+ .thenReturn("host");
+ PowerMock.createMock(DcaeConfigurationParser.class);
+ PowerMock.expectPrivate(DcaeConfigurationParser.class, "parse", "host")
+ .andThrow(new CorrelationException("tests")).anyTimes();
+
+ PowerMock.replayAll();
+ Whitebox.invokeMethod(daceConfigurationPolling, "getDcaeConfigurations");
+ PowerMock.verifyAll();
+ }
+
+ @Test
+ public void testDaceConfigurationPolling_getDcaeConfigurations_null() throws Exception {
+ PowerMock.resetAll();
+ thrown.expect(CorrelationException.class);
+ PowerMockito.mockStatic(MicroServiceConfig.class);
+ when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt"))
+ .thenReturn("host");
+ PowerMock.createMock(DcaeConfigurationParser.class);
+ PowerMock.expectPrivate(DcaeConfigurationParser.class, "parse", "host")
+ .andReturn(null).anyTimes();
+
+ PowerMock.replayAll();
+ DcaeConfigurations dcaeConfigurations = Whitebox
+ .invokeMethod(daceConfigurationPolling, "getDcaeConfigurations");
+ PowerMock.verifyAll();
+
+ assertThat(dcaeConfigurations == null, equalTo(true));
+ }
+
+ @Test
+ public void testDaceConfigurationPolling_addAllCorrelationRules_connection_exception()
+ throws Exception {
+ PowerMock.resetAll();
+ thrown.expect(ProcessingException.class);
+ DcaeConfigurations dcaeConfigurations = new DcaeConfigurations();
+ Rule rule = new Rule("test", "test", 1);
+ dcaeConfigurations.getDefaultRules().add(rule);
+
+ PowerMock.replayAll();
+ Whitebox.invokeMethod(daceConfigurationPolling, "addAllCorrelationRules",
+ dcaeConfigurations);
+ PowerMock.verifyAll();
+ }
+
+ @Test
+ public void testDaceConfigurationPolling_getRuleCreateRequest() throws Exception {
+ PowerMock.resetAll();
+ Rule rule = new Rule("test", "test1", 1);
+ PowerMock.replayAll();
+ RuleCreateRequest actual = Whitebox
+ .invokeMethod(daceConfigurationPolling, "getRuleCreateRequest", rule);
+ PowerMock.verifyAll();
+
+ assertThat(actual.getRuleName(), equalTo("test"));
+ assertThat(actual.getContent(), equalTo("test1"));
+ assertThat(actual.getDescription(), equalTo(""));
+ assertThat(actual.getEnabled(), equalTo(1));
+ }
+
+ @Test
+ public void testDaceConfigurationPolling_run_null_exception() throws Exception {
+ PowerMock.replayAll();
+ PowerMockito.mockStatic(MicroServiceConfig.class);
+ when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt"))
+ .thenReturn("host");
+ PowerMock.replayAll();
+ Whitebox.invokeMethod(daceConfigurationPolling, "run");
+ PowerMock.verifyAll();
+ }
+
+} \ No newline at end of file
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 0c81b98..1697bf4 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
@@ -174,9 +174,9 @@ public class RuleMgtWrapperTest {
PowerMock.replayAll();
RuleAddAndUpdateResponse response = ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest);
- assertThat(response.getRuleId(), equalTo(correlationRuleRet.getRid()));
-
PowerMock.verifyAll();
+
+ assertThat(response.getRuleId(), equalTo(correlationRuleRet.getRid()));
}
@Test