package org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.impl;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.onap.msb.sdk.discovery.common.RouteException;
+import org.onap.msb.sdk.discovery.entity.MicroServiceFullInfo;
+import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
+import org.onap.msb.sdk.discovery.entity.RouteResult;
+import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonConstants;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpRequestProcessor;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.util.CommonUtil;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.inf.IMsbMgmr;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.alibaba.fastjson.JSON;
+import com.google.gson.Gson;
@Component
public class MsbMgmrImpl implements IMsbMgmr {
- private static final Logger logger = LogManager.getLogger("MsbMgmrImpl");
- @Autowired
- private HttpClientBuilder httpClientBuilder;
-
- @Autowired
- private AdaptorEnv adaptorEnv;
-
- @Value("${serviceName}")
- private String serviceName;
-
- @Value("${version}")
- private String version;
+ private static final Logger logger = LoggerFactory.getLogger(MsbMgmrImpl.class);
- @Value("${url}")
- private String url;
+ @Autowired
+ AdaptorEnv adaptorEnv;
- @Value("${protocol}")
- private String protocol;
+ private Gson gson = new Gson();
- @Value("${visualRange}")
- private String visualRange;
-
- @Value("${ip}")
- private String ip;
-
- @Value("${port}")
- private String port;
-
- @Value("${ttl}")
- private String ttl;
-
@Override
public void register() {
- String httpPath = CommonConstants.MSB_REGISTER_SERVICE_PATH;
- RequestMethod method = RequestMethod.POST;
-
try {
- String jsonStr = readVfcAdaptorInfoFromJsonFile();
- String registerResponse = operateHttpTask(jsonStr, httpPath, method);
- logger.info("registerResponse is ", registerResponse);
+ String vfcAdaptorInfoJsonStr = readVfcAdaptorInfoFromJsonFile();
+// MicroServiceInfo msinfo = gson.fromJson(vfcAdaptorInfoJsonStr, MicroServiceInfo.class);
+
+ JSON json = com.alibaba.fastjson.JSON.parseObject(vfcAdaptorInfoJsonStr);
+ MicroServiceInfo msinfo = com.alibaba.fastjson.JSON.toJavaObject(json , MicroServiceInfo.class);
+
+ MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
+ MicroServiceFullInfo microServiceInfo = msbClient.registerMicroServiceInfo(msinfo);
+ logger.info("Registered service response info is " + microServiceInfo.toString());
+
+ } catch (RouteException e) {
+ logger.error("RouteException Failed to register nokia vnfm driver! ", e);
} catch (IOException e) {
- logger.error("Failed to read vfcadaptor info! ", e);
+ logger.error("IOException Failed to register nokia vnfm driver! ", e);
}
}
- public String readVfcAdaptorInfoFromJsonFile() throws IOException {
- InputStream ins = null;
- BufferedInputStream bins = null;
- String fileContent = "";
- String fileName = getAppRoot() + "/etc/adapterInfo/vnfmadapterinfo.json";
-
- try {
- ins = new FileInputStream(fileName);
- bins = new BufferedInputStream(ins);
-
- byte[] contentByte = new byte[ins.available()];
- int num = bins.read(contentByte);
-
- if(num > 0) {
- fileContent = new String(contentByte);
- }
- } catch(FileNotFoundException e) {
- logger.error(fileName + "is not found!", e);
- } finally {
- if(ins != null) {
- ins.close();
- }
- if(bins != null) {
- bins.close();
- }
- }
+ private String readVfcAdaptorInfoFromJsonFile() throws IOException {
+ String filePath = "/etc/adapterInfo/vnfmadapterinfo.json";
+ String fileContent = CommonUtil.getJsonStrFromFile(filePath);
return fileContent;
}
@Override
public void unregister() {
- String httpPath = String.format(CommonConstants.MSB_UNREGISTER_SERVICE_PATH, serviceName, version, ip, port);
- RequestMethod method = RequestMethod.DELETE;
-
try {
String jsonStr = readVfcAdaptorInfoFromJsonFile();
- String registerResponse = operateHttpTask(jsonStr, httpPath, method);
- logger.info("unregisterResponse is ", registerResponse);
+ MicroServiceInfo msinfo = gson.fromJson(jsonStr, MicroServiceInfo.class);
+
+ MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
+ RouteResult routeResult = msbClient.cancelMicroServiceInfo(msinfo.getServiceName(), msinfo.getVersion());
+ logger.info("unregistered service response info is " + routeResult.toString());
+
} catch (IOException e) {
- logger.error("Failed to unregister! ", e);
+ logger.error("Failed to read vfcadaptor info! ", e);
+ } catch (RouteException e) {
+ logger.error("Failed to register nokia vnfm driver! ", e);
}
-
}
- public String operateHttpTask(String httpBodyObj, String httpPath, RequestMethod method) throws ClientProtocolException, IOException {
- String url=adaptorEnv.getMsbApiUriFront() + httpPath;
- HttpRequestProcessor processor = new HttpRequestProcessor(httpClientBuilder, method);
- processor.addHdeader(CommonConstants.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
+ public String getServiceUrlInMsbBySeriveNameAndPort(String serviceName, String version) throws RouteException
+ {
+ String serviceUrl = null;
+ MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
+ MicroServiceFullInfo microServiceInfo = msbClient.queryMicroServiceInfo(serviceName, version);
+ if(null == microServiceInfo)
+ {
+ logger.error("There is no service in MSB for serviceName = {} and version = {}", serviceName, version);
+ }
+ else
+ {
+ serviceUrl = microServiceInfo.getUrl();
+ logger.info("Service Url in MSB for serviceName = {} and version = {} is {}", serviceName, version, serviceUrl);
+ }
+ return serviceUrl;
- processor.addPostEntity(httpBodyObj);
-
- String responseStr = processor.process(url);
-
- return responseStr;
+ }
+
+ public void setAdaptorEnv(AdaptorEnv env) {
+ this.adaptorEnv = env;
}
- public String getAppRoot() {
- String appRoot = null;
- appRoot = System.getProperty("catalina.base");
- if(appRoot != null) {
- appRoot = getCanonicalPath(appRoot);
- }
- return appRoot;
- }
-
- private String getCanonicalPath(final String inPath) {
- String path = null;
- try {
- if(inPath != null) {
- final File file = new File(inPath);
- path = file.getCanonicalPath();
- }
- } catch(final IOException e) {
- logger.error("file.getCanonicalPath() IOException:", e);
- }
- return path;
- }
+ public static final void main(String[] args) {
+ MsbMgmrImpl impl = new MsbMgmrImpl();
+ impl.register();
+ }
}
Code Review / vfc / nfvo / driver / vnfm / svnfm.git / blobdiff