summaryrefslogtreecommitdiffstats
path: root/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
diff options
context:
space:
mode:
Diffstat (limited to 'engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java')
-rw-r--r--engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java41
1 files changed, 0 insertions, 41 deletions
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;
- }
}