From 845c52a1656f5af3d2e4fa5c04d0383a2c2824f1 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Sat, 16 Sep 2017 15:07:47 +0800 Subject: [PATCH] Register the Service Using MSB SDK Change-Id: I265a2da3f49656130d0226805782b458942a2451 Issue-ID: HOLMES-45 Signed-off-by: Guangrong Fu --- dmaap-dsa/pom.xml | 4 +++ .../onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java | 38 +++++++++++++------- .../org/onap/holmes/dsa/resources/HealthCheck.java | 42 ---------------------- pom.xml | 5 +++ 4 files changed, 34 insertions(+), 55 deletions(-) delete mode 100644 dmaap-dsa/src/main/java/org/onap/holmes/dsa/resources/HealthCheck.java diff --git a/dmaap-dsa/pom.xml b/dmaap-dsa/pom.xml index df4d31e..414e271 100644 --- a/dmaap-dsa/pom.xml +++ b/dmaap-dsa/pom.xml @@ -29,6 +29,10 @@ jar + + org.onap.msb.java-sdk + msb-java-sdk + org.onap.holmes.common holmes-actions diff --git a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java b/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java index ab1e36b..55838ae 100644 --- a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java +++ b/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java @@ -16,13 +16,20 @@ package org.onap.holmes.dsa.dmaap; +import static jdk.nashorn.internal.runtime.regexp.joni.Config.log; + import io.dropwizard.setup.Environment; import java.io.IOException; +import java.util.HashSet; +import java.util.Set; import lombok.extern.slf4j.Slf4j; import org.onap.holmes.common.api.entity.ServiceRegisterEntity; 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.MSBRegisterUtil; +import org.onap.msb.sdk.discovery.entity.MicroServiceInfo; +import org.onap.msb.sdk.discovery.entity.Node; @Slf4j public class DmaapDsaActiveApp extends IOCApplication { @@ -33,22 +40,27 @@ public class DmaapDsaActiveApp extends IOCApplication { @Override public void run(DmaapDsaConfig configuration, Environment environment) throws Exception { super.run(configuration, environment); - try { - new MSBRegisterUtil().register(initServiceEntity()); - } catch (IOException e) { - log.warn("Micro service registry httpclient close failure", e); + new MSBRegisterUtil().register2Msb(createMicroServiceInfo()); + } catch (CorrelationException e) { + log.warn(e.getMessage(), e); } } - private ServiceRegisterEntity initServiceEntity() { - ServiceRegisterEntity serviceRegisterEntity = new ServiceRegisterEntity(); - serviceRegisterEntity.setServiceName("holmes-dmaap-dsa"); - serviceRegisterEntity.setProtocol("REST"); - serviceRegisterEntity.setVersion("v1"); - serviceRegisterEntity.setUrl("/api/holmes-dmaap-dsa/v1/"); - serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9103", 0); - serviceRegisterEntity.setVisualRange("1|0"); - return serviceRegisterEntity; + private MicroServiceInfo createMicroServiceInfo() { + String[] serviceAddrInfo = MicroServiceConfig.getServiceAddrInfo(); + MicroServiceInfo msinfo = new MicroServiceInfo(); + msinfo.setServiceName("holmes-dmaap-dsa"); + msinfo.setVersion("v1"); + msinfo.setUrl("/api/holmes-dmaap-dsa/v1/"); + msinfo.setProtocol("REST"); + msinfo.setVisualRange("0|1"); + Set nodes = new HashSet<>(); + Node node = new Node(); + node.setIp(serviceAddrInfo[0]); + node.setPort(serviceAddrInfo[1]); + nodes.add(node); + msinfo.setNodes(nodes); + return msinfo; } } diff --git a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/resources/HealthCheck.java b/dmaap-dsa/src/main/java/org/onap/holmes/dsa/resources/HealthCheck.java deleted file mode 100644 index 060a303..0000000 --- a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/resources/HealthCheck.java +++ /dev/null @@ -1,42 +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.dsa.resources; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.SwaggerDefinition; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import lombok.extern.slf4j.Slf4j; -import org.jvnet.hk2.annotations.Service; - -@Service -@SwaggerDefinition -@Path("/healthcheck") -@Api(tags = {"HealthCheck"}) -@Produces(MediaType.TEXT_PLAIN) -@Slf4j -public class HealthCheck { - @GET - @Produces(MediaType.TEXT_PLAIN) - @ApiOperation(value = "Interface for the health check of the data source adapter module for Holmes") - public boolean healthCheck(){ - return true; - } -} diff --git a/pom.xml b/pom.xml index ea275a5..d134703 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,11 @@ + + org.onap.msb.java-sdk + msb-java-sdk + 1.0.0-SNAPSHOT + org.easymock easymock -- 2.16.6