register esr-server to MSB with java-sdk, remove the unused file.
Change-Id: Ida2bccd06db36430850fc1610ce2bd62b25e7cb6
Issue-ID: MSB-44
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
defaultName: ${DW_DEFAULT_NAME:-Stranger}
# the micro service ip
serviceIp:
+msbIp: 127.0.0.1
+msbPort: 10081
msbServerAddr: http://127.0.0.1:80
# use the simple server factory if you only want to run on a single port
<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-\r
- Copyright 2016-2017 ZTE Corporation.\r
-\r
- Licensed under the Apache License, Version 2.0 (the "License");\r
- you may not use this file except in compliance with the License.\r
- You may obtain a copy of the License at\r
-\r
- http://www.apache.org/licenses/LICENSE-2.0\r
-\r
- Unless required by applicable law or agreed to in writing, software\r
- distributed under the License is distributed on an "AS IS" BASIS,\r
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- See the License for the specific language governing permissions and\r
- limitations under the License.\r
-\r
--->\r
-\r
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
<parent>\r
<artifactId>esr-core-parent</artifactId>\r
<artifactId>ant</artifactId>
<scope>test</scope>
</dependency>
- <!-- UT end -->
+ <!-- MSB java-sdk -->
+ <dependency>
+ <groupId>org.onap.msb.java-sdk</groupId>
+ <artifactId>msb-java-sdk</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
import com.fasterxml.jackson.annotation.JsonInclude;
import io.dropwizard.Application;
import io.dropwizard.assets.AssetsBundle;
-import io.dropwizard.db.DataSourceFactory;
-import io.dropwizard.hibernate.HibernateBundle;
import io.dropwizard.server.SimpleServerFactory;
import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.onap.aai.esr.common.Config;
-import org.onap.aai.esr.common.ServiceRegistrer;
-import org.onap.aai.esr.entity.aai.BaseData;
-import org.onap.aai.esr.entity.aai.EmsData;
-import org.onap.aai.esr.entity.aai.SdncData;
-import org.onap.aai.esr.entity.aai.VimData;
-import org.onap.aai.esr.entity.aai.VnfmData;
+import org.onap.aai.esr.externalservice.msb.MsbHelper;
+import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
bootstrap.addBundle(new AssetsBundle("/api-doc", "/api-doc", "index.html", "api-doc"));
}
- private void initService() {
- Thread registerExtsysService = new Thread(new ServiceRegistrer());
- registerExtsysService.setName("register extsys service to Microservice Bus");
- registerExtsysService.start();
- }
-
-
@Override
public void run(ExtsysAppConfiguration configuration, Environment environment) {
- LOGGER.info("Start to initialize extsys.");
+ LOGGER.info("Start to initialize esr.");
environment.jersey().packages("org.onap.aai.esr.resource");
environment.jersey().register(MultiPartFeature.class);
+ String MSB_IP=configuration.getMsbIp();
+ int MSB_Port=configuration.getMsbPort();
+
initSwaggerConfig(environment, configuration);
Config.setConfigration(configuration);
- initService();
+ MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);
+
+ MsbHelper helper = new MsbHelper(msbClient);
+ try {
+ helper.registerMsb();
+ } catch (Exception e) {
+ LOGGER.error("Register ESR to msb failed", e);
+ }
+
LOGGER.info("Initialize extsys finished.");
}
private String template;
@NotEmpty
- private String defaultName = "OPENO-Extsys";
+ private String defaultName = "ONAP-A&AI-ESR";
+ @NotEmpty
+ private String msbIp;
+
+ @NotEmpty
+ private int msbPort;
+
@NotEmpty
private String msbServerAddr;
+
@Valid
private String serviceIp;
-
- @Valid
- @NotNull
- private DataSourceFactory database = new DataSourceFactory();
-
- @JsonProperty("database")
- public DataSourceFactory getDataSourceFactory() {
- return database;
- }
-
- @JsonProperty("database")
- public void setDataSourceFactory(DataSourceFactory dataSourceFactory) {
- this.database = dataSourceFactory;
- }
-
+
@JsonProperty
public String getTemplate() {
return template;
public void setDefaultName(String name) {
this.defaultName = name;
}
+
+ @JsonProperty
+ public String getMsbIp() {
+ return msbIp;
+ }
+
+ @JsonProperty
+ public String setMsbIp() {
+ return msbIp;
+ }
+
+ @JsonProperty
+ public int getMsbPort() {
+ return msbPort;
+ }
+
+ @JsonProperty
+ public int setMsbPort() {
+ return msbPort;
+ }
@JsonProperty
public String getMsbServerAddr() {
+++ /dev/null
-/**
- * Copyright 2016-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.aai.esr.common;
-
-import org.onap.aai.esr.externalservice.entity.ServiceRegisterEntity;
-import org.onap.aai.esr.externalservice.msb.MicroserviceBusConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Parameters. <br/>
- *
- * @author sun qi
- * @version ESR V1
- */
-public class ServiceRegistrer implements Runnable {
- private final ServiceRegisterEntity extsysEntity = new ServiceRegisterEntity();
- private static final Logger LOG = LoggerFactory.getLogger(ServiceRegistrer.class);
-
- public ServiceRegistrer() {
- initServiceEntity();
- }
-
- @Override
- public void run() {
- LOG.info("start extsys microservice register");
- boolean flag = false;
- int retry = 0;
- while (!flag && retry < 1000) {
- LOG.info("extsys microservice register.retry:" + retry);
- retry++;
- flag = MicroserviceBusConsumer.registerService(extsysEntity);
- if (flag == false) {
- LOG.warn("microservice register failed, sleep 30S and try again.");
- threadSleep(30000);
- } else {
- LOG.info("microservice register success!");
- break;
- }
- }
- LOG.info("extsys microservice register end.");
- }
-
- private void threadSleep(int second) {
- LOG.info("start sleep ....");
- try {
- Thread.sleep(second);
- } catch (InterruptedException error) {
- LOG.error("thread sleep error.errorMsg:" + error.getMessage());
- }
- LOG.info("sleep end .");
- }
-
- private void initServiceEntity() {
- extsysEntity.setServiceName("extsys");
- extsysEntity.setProtocol("REST");
- extsysEntity.setVersion("v1");
- extsysEntity.setUrl("/onapapi/aai/esr/v1");
- extsysEntity.setSingleNode(Config.getConfigration().getServiceIp(), "8100", 0);
- extsysEntity.setVisualRange("1");
- }
-}
+++ /dev/null
-/**
- * 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.aai.esr.externalservice.aai;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.onap.aai.esr.externalservice.entity.ServiceRegisterEntity;
-
-@Path("/aai/v11")
-public interface AaiRest {
-
-@Path("")
-@POST
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-public ServiceRegisterEntity registerServce(@QueryParam("createOrUpdate") String createOrUpdate,
- ServiceRegisterEntity entity)throws Exception;
-}
\ No newline at end of file
--- /dev/null
+/**
+ * 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.aai.esr.externalservice.msb;
+
+import java.net.InetAddress;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
+import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
+import org.onap.msb.sdk.discovery.entity.Node;
+
+public class MsbHelper {
+
+ private MSBServiceClient msbClient;
+
+ public MsbHelper(MSBServiceClient msbClient) {
+ super();
+ this.msbClient = msbClient;
+ }
+
+
+
+ public void registerMsb() throws Exception {
+
+
+ MicroServiceInfo msinfo = new MicroServiceInfo();
+
+ msinfo.setServiceName("animals");
+ msinfo.setVersion("v1");
+ msinfo.setUrl("/api/rpc/v1");
+ msinfo.setProtocol("REST");
+ msinfo.setVisualRange("0|1");
+
+ Set<Node> nodes = new HashSet<>();
+ Node node1 = new Node();
+ node1.setIp(InetAddress.getLocalHost().getHostAddress());
+ node1.setPort("9090");
+ nodes.add(node1);
+ msinfo.setNodes(nodes);
+ msbClient.registerMicroServiceInfo(msinfo, false);
+ }
+}
+++ /dev/null
-/**
- * Copyright 2016-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.aai.esr.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-public class HqlFactory {
-
- private static final Logger logger = LoggerFactory.getLogger(HqlFactory.class);
-
- /**
- * get update hql.
- * @param obj the object that used to be generate the hql
- * @param excludeProperties the properties that need not to be used
- * @param filter the condition after "where"
- * @return hibernate hql
- */
- public static String getUpdateHql(Object obj, String[] excludeProperties, String filter) {
- StringBuffer hql = new StringBuffer();
- String objName = obj.getClass().getSimpleName();
- hql.append("update ");
- hql.append(objName);
- hql.append(" set ");
- Field[] fields = obj.getClass().getDeclaredFields();
- if (obj.getClass().getGenericSuperclass() != null) {
- Field[] parentFields = obj.getClass().getSuperclass().getDeclaredFields();
- fields = concat(fields, parentFields);
- }
- for (Field field : fields) {
- String name = field.getName();
- Method method = null;
- Object value = null;
- if (!contain(excludeProperties, name)) {
- String upperName = name.substring(0, 1).toUpperCase() + name.substring(1);
- try {
- method = obj.getClass().getMethod("get" + upperName);
- value = method.invoke(obj);
- if (value != null) {
- if (value instanceof String) {
- hql.append(name);
- hql.append("=");
- hql.append("'");
- hql.append(value);
- hql.append("'");
- hql.append(",");
- } else {
- hql.append(name);
- hql.append("=");
- hql.append(value);
- hql.append(",");
- }
- }
- } catch (Exception error) {
- logger.error("error while creating update hql", error);
- }
- }
- }
-
- String sql = hql.toString();
- sql = sql.substring(0, sql.lastIndexOf(","));
- if (filter != null) {
- sql = sql + " where " + filter;
- }
- logger.info("update hql is : " + sql);
- return sql;
- }
-
- /**
- * identify whether or not to include target string in source string.
- */
- public static boolean contain(String[] src, String target) {
- if (src == null || src.length == 0 || target == null) {
- return false;
- } else {
- for (String str : src) {
- if (str.equals(target)) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * concat str.
- */
- public static <T> T[] concat(T[] first, T[] second) {
- T[] result = Arrays.copyOf(first, first.length + second.length);
- System.arraycopy(second, 0, result, first.length, second.length);
- return result;
- }
-
- public static String getOidFilter(String key, String value) {
- return key + "= '" + value + "'";
- }
-
- /**
- * get query hql.
- */
- public static String getQueryHql(Object data, String column) {
- StringBuffer hql = new StringBuffer();
- String objName = data.getClass().getSimpleName();
- hql.append("select q.");
- hql.append(column);
- hql.append(" from ");
- hql.append(objName);
- hql.append(" as q where ");
- Field[] fields = data.getClass().getDeclaredFields();
- if (data.getClass().getGenericSuperclass() != null) {
- Field[] parentFields = data.getClass().getSuperclass().getDeclaredFields();
- fields = concat(fields, parentFields);
- }
- for (Field field : fields) {
- String name = field.getName();
- Method method = null;
- Object value = null;
- String upperName = name.substring(0, 1).toUpperCase() + name.substring(1);
- try {
- method = data.getClass().getMethod("get" + upperName);
- value = method.invoke(data);
- if (value != null) {
- if (value instanceof String) {
- hql.append("q." + name);
- hql.append("=");
- hql.append("'");
- hql.append(value);
- hql.append("'");
- hql.append(" and ");
- } else {
- hql.append("q." + name);
- hql.append("=");
- hql.append(value);
- hql.append("and ");
- }
- }
- } catch (Exception e) {
- logger.error("error while creating update hql", e);
- }
- }
- String sql = hql.toString();
- sql = sql.substring(0, sql.lastIndexOf("and"));
-
- logger.info("query hql is : " + sql);
- return sql.trim();
- }
-}
Code Review / aai / esr-server.git / commitdiff