summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--engine-d-standalone/pom.xml2
-rw-r--r--engine-d/pom.xml2
-rw-r--r--engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java41
-rw-r--r--engine-d/src/main/java/org/onap/holmes/engine/Initializer.java81
-rw-r--r--engine-d/src/test/java/org/onap/holmes/engine/EngineDActiveAppTest.java70
-rw-r--r--engine-d/src/test/java/org/onap/holmes/engine/InitializerTest.java52
-rw-r--r--pom.xml4
-rw-r--r--version.properties2
8 files changed, 138 insertions, 116 deletions
diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml
index 6fc7f14..2e02f16 100644
--- a/engine-d-standalone/pom.xml
+++ b/engine-d-standalone/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.holmes.engine-management</groupId>
<artifactId>holmes-engine-parent</artifactId>
- <version>1.2.8-SNAPSHOT</version>
+ <version>1.2.9-SNAPSHOT</version>
</parent>
<artifactId>holmes-engine-d-standalone</artifactId>
diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index 0ba3860..2617afd 100644
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.holmes.engine-management</groupId>
<artifactId>holmes-engine-parent</artifactId>
- <version>1.2.8-SNAPSHOT</version>
+ <version>1.2.9-SNAPSHOT</version>
</parent>
<artifactId>holmes-engine-d</artifactId>
diff --git a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
index 7f49621..135334a 100644
--- a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
@@ -19,18 +19,11 @@ import io.dropwizard.setup.Environment;
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.HttpsUtils;
-import org.onap.holmes.common.utils.MSBRegisterUtil;
import org.onap.holmes.common.utils.transactionid.TransactionIdFilter;
import org.onap.holmes.engine.dcae.DcaeConfigurationPolling;
-import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
-import org.onap.msb.sdk.discovery.entity.Node;
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;
@@ -46,12 +39,6 @@ public class EngineDActiveApp extends IOCApplication<EngineDAppConfig> {
public void run(EngineDAppConfig 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(
@@ -62,32 +49,4 @@ public class EngineDActiveApp extends IOCApplication<EngineDAppConfig> {
environment.servlets().addFilter("logFilter", new TransactionIdFilter()).addMappingForUrlPatterns(EnumSet
.allOf(DispatcherType.class), true, "/*");
}
-
- private MicroServiceInfo createMicroServiceInfo() {
- String msbAddrTemplate = (HttpsUtils.isHttpsEnabled() ? "https" : "http")
- + "://%s:%s/api/holmes-engine-mgmt/v1/healthcheck";
- String[] serviceAddrInfo = MicroServiceConfig.getMicroServiceIpAndPort();
- MicroServiceInfo msinfo = new MicroServiceInfo();
- msinfo.setServiceName("holmes-engine-mgmt");
- msinfo.setVersion("v1");
- msinfo.setUrl("/api/holmes-engine-mgmt/v1");
- msinfo.setPath("/api/holmes-engine-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("9102");
- /* 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], "9102"));
- node.setCheckTimeOut("60s");
- node.setCheckInterval("60s");
- */
- nodes.add(node);
- msinfo.setNodes(nodes);
- return msinfo;
- }
}
diff --git a/engine-d/src/main/java/org/onap/holmes/engine/Initializer.java b/engine-d/src/main/java/org/onap/holmes/engine/Initializer.java
new file mode 100644
index 0000000..2e13be3
--- /dev/null
+++ b/engine-d/src/main/java/org/onap/holmes/engine/Initializer.java
@@ -0,0 +1,81 @@
+/**
+ * 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.engine;
+
+import org.jvnet.hk2.annotations.Service;
+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 = getMicroServiceIpAndPort();
+ MicroServiceInfo msinfo = new MicroServiceInfo();
+ msinfo.setServiceName("holmes-engine-mgmt");
+ msinfo.setVersion("v1");
+ msinfo.setUrl("/api/holmes-engine-mgmt/v1");
+ msinfo.setPath("/api/holmes-engine-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_ENGINE_MGMT_SERVICE_HOST"));
+ node.setPort("9102");
+ /* 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-engine-mgmt/v1/healthcheck";
+ node.setCheckType("HTTP");
+ node.setCheckUrl(String.format(msbAddrTemplate, serviceAddrInfo[0], "9102"));
+ node.setCheckTimeOut("60s");
+ node.setCheckInterval("60s");
+ */
+ nodes.add(node);
+ msinfo.setNodes(nodes);
+ return msinfo;
+ }
+}
diff --git a/engine-d/src/test/java/org/onap/holmes/engine/EngineDActiveAppTest.java b/engine-d/src/test/java/org/onap/holmes/engine/EngineDActiveAppTest.java
deleted file mode 100644
index 7c9b652..0000000
--- a/engine-d/src/test/java/org/onap/holmes/engine/EngineDActiveAppTest.java
+++ /dev/null
@@ -1,70 +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.engine;
-
-import org.easymock.EasyMock;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.holmes.common.config.MicroServiceConfig;
-import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
-import org.onap.msb.sdk.discovery.entity.Node;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.reflect.Whitebox;
-
-import static org.easymock.EasyMock.anyObject;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-@PrepareForTest(MicroServiceConfig.class)
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.net.ssl.*")
-public class EngineDActiveAppTest {
-
- public static void main(String[] args) throws Exception {
- String filePath = "C:\\engine-d.yml";
- new EngineDActiveApp().run(new String[]{"server", filePath});
- }
-
- @Test
- public void testCreateMicroServiceInfo() throws Exception {
- EngineDActiveApp engineDActiveApp = new EngineDActiveApp();
- PowerMock.mockStatic(MicroServiceConfig.class);
- String[] serviceAddrInfo = new String[2];
- serviceAddrInfo[0] = "10.74.216.82";
- serviceAddrInfo[1] = "80";
- EasyMock.expect(MicroServiceConfig.getMicroServiceIpAndPort()).andReturn(serviceAddrInfo);
- EasyMock.expectLastCall();
- EasyMock.expect(MicroServiceConfig.getEnv(anyObject(String.class))).andReturn("true").times(2);
- PowerMock.replayAll();
-
- MicroServiceInfo msinfo = Whitebox.invokeMethod(engineDActiveApp,"createMicroServiceInfo");
-
- PowerMock.verifyAll();
-
- assertThat(msinfo.getServiceName(), equalTo("holmes-engine-mgmt"));
- assertThat(msinfo.getVersion(), equalTo("v1"));
- assertThat(msinfo.getUrl(), equalTo("/api/holmes-engine-mgmt/v1"));
- assertThat(msinfo.getProtocol(), equalTo("REST"));
- assertThat(msinfo.getVisualRange(), equalTo("0|1"));
- assertThat(msinfo.isEnable_ssl(), is(true));
- assertThat(msinfo.getNodes().toArray(new Node[0])[0].getIp(), equalTo(serviceAddrInfo[0]));
- assertThat(msinfo.getNodes().toArray(new Node[0])[0].getPort(), equalTo("9102"));
- }
-}
diff --git a/engine-d/src/test/java/org/onap/holmes/engine/InitializerTest.java b/engine-d/src/test/java/org/onap/holmes/engine/InitializerTest.java
new file mode 100644
index 0000000..e1915e6
--- /dev/null
+++ b/engine-d/src/test/java/org/onap/holmes/engine/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.engine;
+
+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/pom.xml b/pom.xml
index 7561c46..a16dbc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.onap.holmes.engine-management</groupId>
<artifactId>holmes-engine-parent</artifactId>
- <version>1.2.8-SNAPSHOT</version>
+ <version>1.2.9-SNAPSHOT</version>
<packaging>pom</packaging>
<name>holmes-engine-management</name>
<modules>
@@ -164,7 +164,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>io.dropwizard</groupId>
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}