aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/onap/nbi/ServiceRegisterRunner.java137
-rw-r--r--src/main/resources/application.properties14
2 files changed, 1 insertions, 150 deletions
diff --git a/src/main/java/org/onap/nbi/ServiceRegisterRunner.java b/src/main/java/org/onap/nbi/ServiceRegisterRunner.java
deleted file mode 100644
index 23fdb25..0000000
--- a/src/main/java/org/onap/nbi/ServiceRegisterRunner.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Copyright (c) 2018 Orange
- * <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.nbi;
-
-import com.google.common.base.Strings;
-import java.net.InetAddress;
-import java.util.HashSet;
-import java.util.Set;
-import org.onap.msb.sdk.discovery.entity.MicroServiceFullInfo;
-import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
-import org.onap.msb.sdk.discovery.entity.Node;
-import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
-/**
- * Register this NBI instance with MSB discovery when the app is fully started
- */
-@Component
-public class ServiceRegisterRunner implements CommandLineRunner {
- private static final Logger logger = LoggerFactory.getLogger(ServiceRegisterRunner.class);
-
- @Value("${msb.enabled}")
- private boolean IS_ENABLED;
-
- @Value("${msb.discovery.host}")
- private String DISCOVERY_HOST;
-
- @Value("${msb.discovery.port}")
- private int DISCOVERY_PORT;
-
- @Value("${msb.discovery.retry}")
- private int RETRY;
-
- @Value("${msb.discovery.retry_interval}")
- private int RETRY_INTERVAL;
-
- @Value("${msb.service.host}")
- private String SERVICE_HOST;
-
- @Value("${server.port}")
- private String SERVICE_PORT;
-
- @Value("${msb.service.name}")
- private String SERVICE_NAME;
-
- @Value("${nbi.version}")
- private String SERVICE_VERSION;
-
- @Value("${server.servlet.context-path}")
- private String SERVICE_URL;
-
- @Value("${msb.service.custom_path}")
- private String SERVICE_CUSTOM_PATH;
-
- @Value("${msb.service.protocol}")
- private String SERVICE_PROTOCOL;
-
- @Value("${msb.service.visual_range}")
- private String SERVICE_VISUAL_RANGE;
-
- @Value("${msb.service.enable_ssl}")
- private boolean SERVICE_ENABLE_SSL;
-
- @Override
- public void run(String... strings) throws Exception {
- if (!IS_ENABLED) {
- logger.info("Registration with msb discovery is not enabled");
- return;
- }
-
- MicroServiceInfo msinfo = new MicroServiceInfo();
- msinfo.setServiceName(SERVICE_NAME);
- msinfo.setVersion(SERVICE_VERSION);
- msinfo.setUrl(SERVICE_URL);
- msinfo.setProtocol(SERVICE_PROTOCOL);
- msinfo.setVisualRange(SERVICE_VISUAL_RANGE);
- msinfo.setEnable_ssl(SERVICE_ENABLE_SSL);
-
- if (!Strings.isNullOrEmpty(SERVICE_CUSTOM_PATH)) {
- msinfo.setPath(SERVICE_CUSTOM_PATH);
- }
-
- Set<Node> nodes = new HashSet<>();
- Node thisNode = new Node();
- thisNode.setIp(
- Strings.isNullOrEmpty(SERVICE_HOST) ? InetAddress.getLocalHost().getHostAddress() : SERVICE_HOST);
- thisNode.setPort(SERVICE_PORT);
- thisNode.setCheckType("HTTP");
- thisNode.setCheckUrl(SERVICE_URL + "/status");
- nodes.add(thisNode);
- msinfo.setNodes(nodes);
-
- logger.info("Registering with msb discovery (" + DISCOVERY_HOST + ":" + DISCOVERY_PORT + "):\n" + " - host: ["
- + thisNode.getIp() + "]\n" + " - port: [" + thisNode.getPort() + "]\n" + " - name: ["
- + msinfo.getServiceName() + "]\n" + " - version: [" + msinfo.getVersion() + "]\n" + " - url: ["
- + msinfo.getUrl() + "]\n" + " - path: [" + msinfo.getPath() + "]\n" + " - protocol: ["
- + msinfo.getProtocol() + "]g\n" + " - visualRange: [" + msinfo.getVisualRange() + "]\n"
- + " - enableSSL: [" + SERVICE_ENABLE_SSL + "]\n");
-
- int attempt = 1;
- while (attempt <= RETRY) {
- try {
- logger.info("Registration with msb discovery (attempt {}/{})", attempt, RETRY);
- MSBServiceClient msbClient = new MSBServiceClient(DISCOVERY_HOST, DISCOVERY_PORT);
- MicroServiceFullInfo microServiceFullInfo = msbClient.registerMicroServiceInfo(msinfo);
- logger.debug("Registration with msb discovery done, microServiceFullInfo = {}",
- microServiceFullInfo.toString());
- break;
- } catch (Exception ex) {
- logger.warn("Registration with msb discovery (attempt {}/{}) FAILED.", attempt, RETRY);
- attempt += 1;
- if (attempt <= RETRY) {
- logger.warn("Sleep {}ms", RETRY_INTERVAL);
- Thread.sleep(RETRY_INTERVAL);
- }
- }
- }
- }
-}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d3a7d19..e719c6f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -74,7 +74,6 @@ so.owning.entity.name = OE-generic
so.project.name = Project-generic
so.onap.partner.name = NBI
-
# DMAAP
dmaap.host = http://10.0.6.1:3904
dmaap.aai.topic = AAI-EVENT
@@ -83,18 +82,7 @@ dmaap.consumergroup = NBICG1
dmaap.consumerid = NBIC1
dmaap.timeout = 2000
-# MSB
-msb.enabled = true
-msb.discovery.host = msb_discovery
-msb.discovery.port = 10081
-msb.discovery.retry = 1
-msb.discovery.retry_interval = 5000
-msb.service.host =
-msb.service.name = nbi
-msb.service.custom_path =
-msb.service.protocol = REST
-msb.service.visual_range = 1
-msb.service.enable_ssl = false
+
# MONGO
spring.data.mongodb.host = localhost