summaryrefslogtreecommitdiffstats
path: root/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service
diff options
context:
space:
mode:
Diffstat (limited to 'lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service')
-rw-r--r--lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapter2MSBManager.java20
-rw-r--r--lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapterMgrService.java9
-rw-r--r--lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/business/impl/VnfpackageServiceImpl.java17
-rw-r--r--lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/rest/VnfpackageRoa.java12
4 files changed, 32 insertions, 26 deletions
diff --git a/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapter2MSBManager.java b/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapter2MSBManager.java
index 5e9a7b6..f9d21d8 100644
--- a/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapter2MSBManager.java
+++ b/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapter2MSBManager.java
@@ -18,9 +18,9 @@ package org.openo.vnfsdk.lctest.service.adapter.impl;
import java.util.Map;
-import org.openo.baseservice.roa.util.restclient.RestfulResponse;
+
import org.openo.vnfsdk.lctest.common.constant.Constant;
-import org.openo.vnfsdk.lctest.common.util.RestfulUtil;
+import org.openo.vnfsdk.lctest.common.util.RestResponse;
import org.openo.vnfsdk.lctest.service.adapter.inf.ILifecycleTestAdapter2MSBManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,28 +43,28 @@ public class LifecycleTestAdapter2MSBManager implements ILifecycleTestAdapter2MS
public JSONObject registerLifecycleTest(Map<String, String> paramsMap, JSONObject driverInfo) {
JSONObject resultObj = new JSONObject();
- RestfulResponse rsp = RestfulUtil.getRemoteResponse(paramsMap, driverInfo.toString());
+ RestResponse rsp = new RestResponse();// = RestfulUtil.getRemoteResponse(paramsMap, driverInfo.toString());
if(null == rsp) {
LOG.error("function=registerLifecycleTest, RestfulResponse is null");
resultObj.put(Constant.REASON, "RestfulResponse is null.");
resultObj.put(Constant.RETCODE, Constant.ERROR_CODE);
return resultObj;
}
- LOG.warn("function=registerLifecycleTest, status={}, content={}.", rsp.getStatus(), rsp.getResponseContent());
- String resultCreate = rsp.getResponseContent();
+ LOG.warn("function=registerLifecycleTest, status={}, content={}.", rsp.getStatusCode(), rsp.getResult());
+ String resultCreate = rsp.getResult();
- if(rsp.getStatus() == Constant.HTTP_CREATED) {
+ if(rsp.getStatusCode() == Constant.HTTP_CREATED) {
LOG.warn("function=registerLifecycleTest, result={}.", resultCreate);
resultObj = JSONObject.fromObject(resultCreate);
resultObj.put("retCode", Constant.HTTP_CREATED);
return resultObj;
- } else if(rsp.getStatus() == Constant.HTTP_INVALID_PARAMETERS) {
+ } else if(rsp.getStatusCode() == Constant.HTTP_INVALID_PARAMETERS) {
LOG.error("function=registerLifecycleTest, msg=MSB return fail,invalid parameters,status={}, result={}.",
- rsp.getStatus(), resultCreate);
+ rsp.getStatusCode(), resultCreate);
resultObj.put("reason", "MSB return fail,invalid parameters.");
- } else if(rsp.getStatus() == Constant.HTTP_INNERERROR_CODE) {
+ } else if(rsp.getStatusCode() == Constant.HTTP_INNERERROR_CODE) {
LOG.error("function=registerLifecycleTest, msg=MSB return fail,internal system error,status={}, result={}.",
- rsp.getStatus(), resultCreate);
+ rsp.getStatusCode(), resultCreate);
resultObj.put("reason", "MSB return fail,internal system error.");
}
resultObj.put("retCode", Constant.ERROR_CODE);
diff --git a/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapterMgrService.java b/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapterMgrService.java
index 3c0b627..a9efae3 100644
--- a/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapterMgrService.java
+++ b/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/adapter/impl/LifecycleTestAdapterMgrService.java
@@ -25,10 +25,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Executors;
-import org.openo.baseservice.util.impl.SystemEnvVariablesFactory;
+
import org.openo.vnfsdk.lctest.common.constant.Constant;
import org.openo.vnfsdk.lctest.common.constant.UrlConstant;
-import org.openo.vnfsdk.lctest.common.util.RestfulUtil;
+import org.openo.vnfsdk.lctest.common.util.RestConstant;
+
import org.openo.vnfsdk.lctest.service.adapter.inf.ILifecycleTestAdapter2MSBManager;
import org.openo.vnfsdk.lctest.service.adapter.inf.ILifecycleTestAdapterMgrService;
import org.slf4j.Logger;
@@ -57,7 +58,7 @@ public class LifecycleTestAdapterMgrService implements ILifecycleTestAdapterMgrS
// set MSB URL and mothedtype
Map<String, String> paramsMap = new HashMap<>();
paramsMap.put("url", UrlConstant.REST_MSB_REGISTER);
- paramsMap.put("methodType", RestfulUtil.TYPE_POST);
+ paramsMap.put("methodType", RestConstant.MethodType.POST);
// get LifecycleTest info and raise registration
try {
@@ -87,7 +88,7 @@ public class LifecycleTestAdapterMgrService implements ILifecycleTestAdapterMgrS
BufferedInputStream bins = null;
String fileContent = "";
- String fileName = SystemEnvVariablesFactory.getInstance().getAppRoot() + System.getProperty(Constant.SEPARATOR)
+ String fileName = "./" + System.getProperty(Constant.SEPARATOR)
+ "etc" + System.getProperty(Constant.SEPARATOR) + "adapterInfo"
+ System.getProperty(Constant.SEPARATOR) + LIFECYCLETESTINFO;
diff --git a/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/business/impl/VnfpackageServiceImpl.java b/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/business/impl/VnfpackageServiceImpl.java
index e566577..9a6a959 100644
--- a/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/business/impl/VnfpackageServiceImpl.java
+++ b/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/business/impl/VnfpackageServiceImpl.java
@@ -20,7 +20,8 @@ import java.util.HashMap;
import java.util.Map;
import org.openo.vnfsdk.lctest.common.constant.UrlConstant;
-import org.openo.vnfsdk.lctest.common.util.RestfulUtil;
+import org.openo.vnfsdk.lctest.common.util.RestConstant;
+import org.openo.vnfsdk.lctest.common.util.RestfulClient;
import org.openo.vnfsdk.lctest.service.business.inf.VnfpackageService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +39,9 @@ import net.sf.json.JSONObject;
public class VnfpackageServiceImpl implements VnfpackageService {
private static final Logger LOGGER = LoggerFactory.getLogger(VnfpackageServiceImpl.class);
+
+ private static String MsbIpAddress = "127.0.0.1";
+ private static int MsbPort = 80;
/**
* <br>
@@ -51,8 +55,8 @@ public class VnfpackageServiceImpl implements VnfpackageService {
LOGGER.info("VnfpackageServiceImpl::onboarding:{}", object.toString());
Map<String, String> paramsMap = new HashMap<>(3);
paramsMap.put("url", UrlConstant.NSLCM_VNFPACKAGE_URL);
- paramsMap.put("methodType", RestfulUtil.TYPE_POST);
- String rsp = RestfulUtil.getRemoteResponseContent(paramsMap, object.toString());
+ paramsMap.put("methodType", RestConstant.MethodType.POST);
+ String rsp = null; //RestfulUtil.getRemoteResponseContent(paramsMap, object.toString());
if(null == rsp) {
JSONObject resJson = new JSONObject();
resJson.put("message", "NS LCM response Error.");
@@ -72,7 +76,8 @@ public class VnfpackageServiceImpl implements VnfpackageService {
@Override
public JSONObject queryVnfpackage(String csarId) {
String url = String.format(UrlConstant.QUERY_VNFPACKAGE_URL, csarId);
- JSONObject rsp = RestfulUtil.getResponseObj(url, RestfulUtil.TYPE_GET);
+ JSONObject rsp = null;//RestfulClient.get(MsbIpAddress, MsbPort, url).getResult();
+
if(null == rsp) {
JSONObject resJson = new JSONObject();
resJson.put("message", "NS LCM response Error.");
@@ -94,8 +99,8 @@ public class VnfpackageServiceImpl implements VnfpackageService {
LOGGER.info("VnfpackageServiceImpl::updatestatus:{}", object.toString());
Map<String, String> paramsMap = new HashMap<>(3);
paramsMap.put("url", UrlConstant.MARKETPLACE_UPDATE_STATUS_URL);
- paramsMap.put("methodType", RestfulUtil.TYPE_POST);
- String rsp = RestfulUtil.getRemoteResponseContent(paramsMap, object.toString());
+ paramsMap.put("methodType", RestConstant.MethodType.POST);
+ String rsp = null; //RestfulUtil.getRemoteResponseContent(paramsMap, object.toString());
if(null == rsp) {
JSONObject resJson = new JSONObject();
resJson.put("message", "Marketplace response Error.");
diff --git a/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/rest/VnfpackageRoa.java b/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/rest/VnfpackageRoa.java
index e1d271d..f59a6be 100644
--- a/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/rest/VnfpackageRoa.java
+++ b/lifecycle-test/src/main/java/org/openo/vnfsdk/lctest/service/rest/VnfpackageRoa.java
@@ -26,7 +26,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+
import org.openo.vnfsdk.lctest.common.util.RequestUtil;
import org.openo.vnfsdk.lctest.service.business.inf.VnfpackageService;
import org.slf4j.Logger;
@@ -60,11 +60,11 @@ public class VnfpackageRoa {
* @since NFVO 0.5
*/
@POST
- public JSONObject onboarding(@Context HttpServletRequest context) throws ServiceException {
+ public JSONObject onboarding(@Context HttpServletRequest context) {
JSONObject object = RequestUtil.getJsonRequestBody(context);
if(null == object) {
LOGGER.error("function=onboarding; msg=context is null.");
- throw new ServiceException("org.openo.vnfsdk.lctest.service.rest.VnfpackageRoa.onboarding.null");
+ //throw new ServiceException("org.openo.vnfsdk.lctest.service.rest.VnfpackageRoa.onboarding.null");
}
LOGGER.info("VnfpackageRoa::onboarding:{}", object.toString());
@@ -73,11 +73,11 @@ public class VnfpackageRoa {
@POST
@Path("/updatestatus")
- public JSONObject updatestatus(@Context HttpServletRequest context) throws ServiceException {
+ public JSONObject updatestatus(@Context HttpServletRequest context) {
JSONObject object = RequestUtil.getJsonRequestBody(context);
if(null == object) {
LOGGER.error("function=onboarding; msg=context is null.");
- throw new ServiceException("org.openo.vnfsdk.lctest.service.rest.VnfpackageRoa.onboarding.null");
+ //throw new ServiceException("org.openo.vnfsdk.lctest.service.rest.VnfpackageRoa.onboarding.null");
}
LOGGER.info("VnfpackageRoa::updatestatus:{}", object.toString());
@@ -96,7 +96,7 @@ public class VnfpackageRoa {
@GET
@Path("/{csarId}")
public JSONObject queryVnfpackage(@Context HttpServletRequest context, @PathParam("csarId") String csarId)
- throws ServiceException {
+ {
LOGGER.warn("function=queryVnfpackage, csarId={}", csarId);
return vnfpackageService.queryVnfpackage(csarId);
}