diff options
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | rulemgt-frontend/pom.xml | 2 | ||||
| -rw-r--r-- | rulemgt-standalone/pom.xml | 2 | ||||
| -rw-r--r-- | rulemgt/pom.xml | 2 | ||||
| -rw-r--r-- | rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java | 82 | ||||
| -rw-r--r-- | rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java | 43 | ||||
| -rw-r--r-- | rulemgt/src/test/java/org/onap/holmes/rulemgt/InitializerTest.java | 52 | ||||
| -rw-r--r-- | rulemgt/src/test/java/org/onap/holmes/rulemgt/RuleActiveAppTest.java | 25 | ||||
| -rw-r--r-- | version.properties | 2 |
9 files changed, 140 insertions, 74 deletions
@@ -25,7 +25,7 @@ <groupId>org.onap.holmes.rule-management</groupId>
<artifactId>holmes-rulemgt-parent</artifactId>
- <version>1.2.8-SNAPSHOT</version>
+ <version>1.2.9-SNAPSHOT</version>
<packaging>pom</packaging>
<name>holmes-rule-management</name>
<modules>
@@ -126,7 +126,7 @@ <dependency>
<groupId>org.onap.holmes.common</groupId>
<artifactId>holmes-actions</artifactId>
- <version>1.3.1</version>
+ <version>1.3.2</version>
<exclusions>
<exclusion>
<groupId>org.glassfish.jersey.containers</groupId>
diff --git a/rulemgt-frontend/pom.xml b/rulemgt-frontend/pom.xml index 605bd91..a9957d2 100644 --- a/rulemgt-frontend/pom.xml +++ b/rulemgt-frontend/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.holmes.rule-management</groupId> <artifactId>holmes-rulemgt-parent</artifactId> - <version>1.2.8-SNAPSHOT</version> + <version>1.2.9-SNAPSHOT</version> </parent> <artifactId>holmes-rulemgt-frontend</artifactId> diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml index 1ef97a3..15d4487 100644 --- a/rulemgt-standalone/pom.xml +++ b/rulemgt-standalone/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.holmes.rule-management</groupId> <artifactId>holmes-rulemgt-parent</artifactId> - <version>1.2.8-SNAPSHOT</version> + <version>1.2.9-SNAPSHOT</version> </parent> <artifactId>holmes-rulemgt-standalone</artifactId> diff --git a/rulemgt/pom.xml b/rulemgt/pom.xml index d11ab04..50b1674 100644 --- a/rulemgt/pom.xml +++ b/rulemgt/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.holmes.rule-management</groupId> <artifactId>holmes-rulemgt-parent</artifactId> - <version>1.2.8-SNAPSHOT</version> + <version>1.2.9-SNAPSHOT</version> </parent> <artifactId>holmes-rulemgt</artifactId> diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java new file mode 100644 index 0000000..92c77ab --- /dev/null +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java @@ -0,0 +1,82 @@ +/** + * Copyright 2017-2018 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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; + +import org.jvnet.hk2.annotations.Service; +import org.onap.holmes.common.config.MicroServiceConfig; +import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.common.utils.HttpsUtils; +import org.onap.holmes.common.utils.MsbRegister; +import org.onap.msb.sdk.discovery.entity.MicroServiceInfo; +import org.onap.msb.sdk.discovery.entity.Node; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import java.util.HashSet; +import java.util.Set; + +import static org.onap.holmes.common.config.MicroServiceConfig.*; + +@Service +public class Initializer { + private static final Logger logger = LoggerFactory.getLogger(Initializer.class); + private MsbRegister msbRegister; + + @Inject + public Initializer(MsbRegister msbRegister) { + this.msbRegister = msbRegister; + } + + @PostConstruct + private void init() { + try { + msbRegister.register2Msb(createMicroServiceInfo()); + } catch (CorrelationException e) { + logger.error(e.getMessage(), e); + } + } + + private MicroServiceInfo createMicroServiceInfo() { + String[] serviceIpAndPort = MicroServiceConfig.getMicroServiceIpAndPort(); + MicroServiceInfo msinfo = new MicroServiceInfo(); + msinfo.setServiceName("holmes-rule-mgmt"); + msinfo.setVersion("v1"); + msinfo.setUrl("/api/holmes-rule-mgmt/v1"); + msinfo.setPath("/api/holmes-rule-mgmt/v1"); + msinfo.setProtocol("REST"); + msinfo.setVisualRange("0|1"); + msinfo.setLb_policy("round-robin"); + msinfo.setEnable_ssl(HttpsUtils.isHttpsEnabled()); + Set<Node> nodes = new HashSet<>(); + Node node = new Node(); + node.setIp(isIpAddress(serviceIpAndPort[0]) ? serviceIpAndPort[0] : getEnv("HOLMES_RULE_MGMT_SERVICE_HOST")); + node.setPort("9101"); + /* Following codes will cause an unregistration from MSB (due to MSB malfunction), comment them for now + String msbAddrTemplate = (HttpsUtils.isHttpsEnabled() ? "https" : "http") + + "://%s:%s/api/holmes-rule-mgmt/v1/healthcheck"; + node.setCheckType("HTTP"); + node.setCheckUrl(String.format(msbAddrTemplate, serviceAddrInfo[0], "9101")); + node.setCheckTimeOut("60s"); + node.setCheckInterval("60s"); + */ + nodes.add(node); + msinfo.setNodes(nodes); + return msinfo; + } +} 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 5833a94..0385f91 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java @@ -19,28 +19,19 @@ package org.onap.holmes.rulemgt; import io.dropwizard.setup.Environment; 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.HttpsUtils; -import org.onap.holmes.common.utils.MSBRegisterUtil; import org.onap.holmes.common.utils.transactionid.TransactionIdFilter; import org.onap.holmes.rulemgt.dcae.DcaeConfigurationPolling; -import org.onap.msb.sdk.discovery.entity.MicroServiceInfo; -import org.onap.msb.sdk.discovery.entity.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.servlet.DispatcherType; import java.util.EnumSet; -import java.util.HashSet; -import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; public class RuleActiveApp extends IOCApplication<RuleAppConfig> { - private Logger log = LoggerFactory.getLogger(RuleActiveApp.class); - public static void main(String[] args) throws Exception { new RuleActiveApp().run(args); } @@ -49,12 +40,6 @@ public class RuleActiveApp extends IOCApplication<RuleAppConfig> { public void run(RuleAppConfig configuration, Environment environment) throws Exception { super.run(configuration, environment); - try { - new MSBRegisterUtil().register2Msb(createMicroServiceInfo()); - } catch (CorrelationException e) { - log.warn(e.getMessage(), e); - } - if (!"1".equals(System.getenv("TESTING"))) { ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor(); service.scheduleAtFixedRate( @@ -65,33 +50,5 @@ public class RuleActiveApp extends IOCApplication<RuleAppConfig> { environment.servlets().addFilter("customFilter", new TransactionIdFilter()).addMappingForUrlPatterns(EnumSet .allOf(DispatcherType.class), true, "/*"); } - - private MicroServiceInfo createMicroServiceInfo() { - String msbAddrTemplate = (HttpsUtils.isHttpsEnabled() ? "https" : "http") - + "://%s:%s/api/holmes-rule-mgmt/v1/healthcheck"; - String[] serviceAddrInfo = MicroServiceConfig.getMicroServiceIpAndPort(); - MicroServiceInfo msinfo = new MicroServiceInfo(); - msinfo.setServiceName("holmes-rule-mgmt"); - msinfo.setVersion("v1"); - msinfo.setUrl("/api/holmes-rule-mgmt/v1"); - msinfo.setPath("/api/holmes-rule-mgmt/v1"); - msinfo.setProtocol("REST"); - msinfo.setVisualRange("0|1"); - msinfo.setLb_policy("round-robin"); - msinfo.setEnable_ssl(HttpsUtils.isHttpsEnabled()); - Set<Node> nodes = new HashSet<>(); - Node node = new Node(); - node.setIp(serviceAddrInfo[0]); - node.setPort("9101"); - /* Following codes will cause an unregistration from MSB (due to MSB malfunction), comment them for now - node.setCheckType("HTTP"); - node.setCheckUrl(String.format(msbAddrTemplate, serviceAddrInfo[0], "9101")); - node.setCheckTimeOut("60s"); - node.setCheckInterval("60s"); - */ - nodes.add(node); - msinfo.setNodes(nodes); - return msinfo; - } } diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/InitializerTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/InitializerTest.java new file mode 100644 index 0000000..3f071b3 --- /dev/null +++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/InitializerTest.java @@ -0,0 +1,52 @@ +/** + * Copyright 2020 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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; + +import org.easymock.EasyMock; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.onap.holmes.common.config.MicroServiceConfig; +import org.onap.holmes.common.utils.MsbRegister; +import org.onap.msb.sdk.discovery.entity.MicroServiceInfo; +import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; +import org.powermock.modules.junit4.PowerMockRunner; +import org.powermock.reflect.internal.WhiteboxImpl; + +@RunWith(PowerMockRunner.class) +@PrepareForTest(MicroServiceConfig.class) +@SuppressStaticInitializationFor("org.onap.holmes.common.utils.HttpsUtils") +public class InitializerTest { + + @Test + public void process() throws Exception { + MsbRegister mockedMsbRegister = PowerMock.createMock(MsbRegister.class); + Initializer initializer = new Initializer(mockedMsbRegister); + + PowerMock.mockStaticPartial(MicroServiceConfig.class, "getMicroServiceIpAndPort", "getEnv"); + EasyMock.expect(MicroServiceConfig.getMicroServiceIpAndPort()).andReturn(new String[]{"127.0.0.1", "443"}); + EasyMock.expect(MicroServiceConfig.getEnv("ENABLE_ENCRYPT")).andReturn("true"); + + mockedMsbRegister.register2Msb(EasyMock.anyObject(MicroServiceInfo.class)); + EasyMock.expectLastCall(); + + PowerMock.replayAll(); + + WhiteboxImpl.invokeMethod(initializer, "init"); + + PowerMock.verifyAll(); + } +}
\ No newline at end of file diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/RuleActiveAppTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/RuleActiveAppTest.java deleted file mode 100644 index e34643a..0000000 --- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/RuleActiveAppTest.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2017-2020 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; - -public class RuleActiveAppTest { - - public static void main(String[] args) throws Exception { - String filePath = "E:\\Codes\\ONAP\\holmes\\rule-management\\rulemgt-standalone\\src\\main\\assembly\\conf\\rulemgt.yml"; - new RuleActiveApp().run(new String[]{"server", filePath}); - } -}
\ No newline at end of file diff --git a/version.properties b/version.properties index c2bb012..e4b2e4a 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1
minor=2
-patch=8
+patch=9
base_version=${major}.${minor}.${patch}
|