From 3313e006a487f0debeae810d46933e6c17967ace Mon Sep 17 00:00:00 2001 From: GuangrongFu Date: Fri, 23 Oct 2020 12:30:18 +0800 Subject: Register Holmes to MSB Using Ordinary HTTPS Request Change-Id: Ie70c719c1ec655d20d1c92265a8d9b0cf81c5696 Issue-ID: HOLMES-368 Signed-off-by: GuangrongFu --- .../org/onap/holmes/engine/EngineDActiveApp.java | 41 ----------- .../java/org/onap/holmes/engine/Initializer.java | 81 ++++++++++++++++++++++ 2 files changed, 81 insertions(+), 41 deletions(-) create mode 100644 engine-d/src/main/java/org/onap/holmes/engine/Initializer.java (limited to 'engine-d/src/main') 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 { 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 { 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 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. + *

+ * 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.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 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; + } +} -- cgit 1.2.3-korg