--- /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.exception;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+public class ExceptionUtil {
+
+ private static final int EXCEPTION_CODE = 498;
+
+ private ExceptionUtil() {
+
+ }
+
+ public static WebApplicationException buildExceptionResponse(String message) {
+ Response response = Response.status(EXCEPTION_CODE).entity(message).type(MediaType.TEXT_PLAIN).build();
+ return new WebApplicationException(response);
+ }
+}
super();
}
- public ExtsysException(String errorCode, String errorMsg) {
- this.errorCode = errorCode;
- this.errorMsg = errorMsg;
+ public ExtsysException(String msg, Exception e) {
+ super(msg, e);
+ }
+
+ public ExtsysException(String msg) {
+ super(msg);
}
}
import org.glassfish.jersey.client.ClientConfig;
import org.onap.aai.esr.common.MsbConfig;
import org.onap.aai.esr.entity.aai.CloudRegionDetail;
+import org.onap.aai.esr.exception.ExtsysException;
import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
}
public void registerVim(String cloudOwner, String cloudRegionId,
- CloudRegionDetail cloudRegion) throws Exception {
+ CloudRegionDetail cloudRegion) throws ExtsysException {
ClientConfig config = new ClientConfig(new VimRegisterProvider());
ICloudRegion registerVimServiceproxy = ConsumerFactory
.createConsumer(MsbConfig.getCloudInfrastructureAddr(), config, ICloudRegion.class);
- registerVimServiceproxy.registerVIMService(transactionId, fromAppId, authorization, cloudOwner,
- cloudRegionId, cloudRegion);
+ try {
+ registerVimServiceproxy.registerVIMService(transactionId, fromAppId, authorization, cloudOwner,
+ cloudRegionId, cloudRegion);
+ } catch (Exception e) {
+ throw new ExtsysException("PUT cloud region to A&AI failed.", e);
+ }
}
- public String queryVimDetail(String cloud_owner, String cloud_region_id) throws Exception {
- return adapterServiceproxy.queryVIMDetail(transactionId, fromAppId, authorization, cloud_owner,
- cloud_region_id);
+ public String queryVimDetail(String cloud_owner, String cloud_region_id) throws ExtsysException {
+ try {
+ return adapterServiceproxy.queryVIMDetail(transactionId, fromAppId, authorization, cloud_owner,
+ cloud_region_id);
+ } catch (Exception e) {
+ throw new ExtsysException("Query cloud region detail from A&AI failed.", e);
+ }
}
- public String qureyVimList() throws Exception {
- return adapterServiceproxy.queryVIMList(transactionId, fromAppId, authorization);
+ public String qureyVimList() throws ExtsysException {
+ try {
+ return adapterServiceproxy.queryVIMList(transactionId, fromAppId, authorization);
+ } catch (Exception e) {
+ throw new ExtsysException("Query cloud region list from A&AI failed.", e);
+ }
}
- public void deleteVim(String cloud_owner, String cloud_region_id, String resourceVersion)
- throws Exception {
- adapterServiceproxy.deleteVim(transactionId, fromAppId, authorization, cloud_owner,
- cloud_region_id, resourceVersion);
+ public void deleteVim(String cloud_owner, String cloud_region_id, String resourceVersion) throws ExtsysException
+ {
+ try {
+ adapterServiceproxy.deleteVim(transactionId, fromAppId, authorization, cloud_owner,
+ cloud_region_id, resourceVersion);
+ } catch (Exception e) {
+ throw new ExtsysException("Delete cloud region from A&AI failed.", e);
+ }
}
}
import org.glassfish.jersey.client.ClientConfig;
import org.onap.aai.esr.common.MsbConfig;
+import org.onap.aai.esr.exception.ExtsysException;
import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
public class VimManagerProxy {
public static void updateVim(String cloudOwner, String cloudRegionId,
- Tenant tenant) throws Exception {
+ Tenant tenant) throws ExtsysException {
ClientConfig config = new ClientConfig(new VimUpdateProvider());
IVimManage updateVimServiceproxy = ConsumerFactory
.createConsumer(MsbConfig.getCloudInfrastructureAddr(), config, IVimManage.class);
- updateVimServiceproxy.updateVIM(cloudOwner, cloudRegionId, tenant);
+ try {
+ updateVimServiceproxy.updateVIM(cloudOwner, cloudRegionId, tenant);
+ } catch (Exception e) {
+ throw new ExtsysException("Update cloud region to A&AI by Multi-Cloud failed.", e);
+ }
}
}
public EsrEmsDetail emsRegisterInfo2EsrEms(EmsRegisterInfo emsRegisterInfo) {
EsrEmsDetail esrEms = new EsrEmsDetail();
- esrEms.setEmsId(ExtsysUtil.generateId());
+ esrEms.setEmsId(extsysUtil.generateId());
ArrayList<EsrSystemInfo> authInfos = new ArrayList<EsrSystemInfo>();
authInfos = getAuthInfosFromRegisterData(emsRegisterInfo);
esrEms.setEsrSystemInfoList(extsysUtil.getEsrSystemInfoListFromAuthInfoList(authInfos));
authInfo.setPassword(ftpAddr.getPassword());
authInfo.setRemotePath(ftpAddr.getRemotepath());
authInfo.setPassive(ftpAddr.getPassive());
- authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
+ authInfo.setEsrSystemInfoId(extsysUtil.generateId());
authInfo.setSystemType(systemType);
authInfo.setSystemName(emsRegisterInfo.getName());
authInfo.setVendor(emsRegisterInfo.getVendor());
EsrSystemInfo authInfo = new EsrSystemInfo();
AlarmAddr alarmAddr = new AlarmAddr();
alarmAddr = emsRegisterInfo.getAlarmAddr();
- authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
+ authInfo.setEsrSystemInfoId(extsysUtil.generateId());
authInfo.setIpAddress(alarmAddr.getIp());
authInfo.setPort(alarmAddr.getPort());
authInfo.setUserName(alarmAddr.getUser());
import com.google.gson.Gson;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-
import java.util.ArrayList;
import java.util.UUID;
-
import org.onap.aai.esr.entity.aai.EsrSystemInfo;
import org.onap.aai.esr.entity.aai.EsrSystemInfoList;
public class ExtsysUtil {
- public static String generateId() {
+ public String generateId() {
return UUID.randomUUID().toString();
}
import org.onap.aai.esr.entity.rest.ThirdpartySdncRegisterInfo;
public class ThirdpartySdncManagerUtil {
+ private static ExtsysUtil extsysUtil = new ExtsysUtil();
public EsrThirdpartySdncDetail sdncRegisterInfo2EsrSdnc(ThirdpartySdncRegisterInfo sdncRegisterInfo) {
EsrThirdpartySdncDetail esrThirdpartySdnc = new EsrThirdpartySdncDetail();
- sdncRegisterInfo.setThirdpartySdncId(ExtsysUtil.generateId());
+ sdncRegisterInfo.setThirdpartySdncId(extsysUtil.generateId());
esrThirdpartySdnc.setThirdpartySdncId(sdncRegisterInfo.getThirdpartySdncId());
esrThirdpartySdnc.setLocation(sdncRegisterInfo.getLocation());
esrThirdpartySdnc.setProductName(sdncRegisterInfo.getProductName());
EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
EsrSystemInfo authInfo = new EsrSystemInfo();
- authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
+ authInfo.setEsrSystemInfoId(extsysUtil.generateId());
authInfo.setVersion(sdncRegisterInfo.getVersion());
authInfo.setSystemName(sdncRegisterInfo.getName());
authInfo.setServiceUrl(sdncRegisterInfo.getUrl());
import org.onap.aai.esr.entity.rest.VimAuthInfo;
import org.onap.aai.esr.entity.rest.VimRegisterInfo;
-
public class VimManagerUtil {
private static ExtsysUtil extsysUtil = new ExtsysUtil();
esrSystemInfoObj.setServiceUrl(vimAuthInfo.getAuthUrl());
esrSystemInfoObj.setSslCassert(vimAuthInfo.getSslCacert());
esrSystemInfoObj.setSslInsecure(vimAuthInfo.getSslInsecure());
- esrSystemInfoObj.setEsrSystemInfoId(ExtsysUtil.generateId());
+ esrSystemInfoObj.setEsrSystemInfoId(extsysUtil.generateId());
esrSystemInfoObj.setSystemType(SystemType.VIM.toString());
// esrSystemInfoObj.setSystemStatus(SystemStatus.normal.toString());
return esrSystemInfoObj;
EsrSystemInfo authInfo = new EsrSystemInfo();
esrVnfm.setCertificateUrl(vnfmRegisterInfo.getCertificateUrl());
esrVnfm.setVimId(vnfmRegisterInfo.getVimId());
- esrVnfm.setVnfmId(ExtsysUtil.generateId());
+ esrVnfm.setVnfmId(extsysUtil.generateId());
authInfo = getAuthInfoFromVnfmRegisterInfo(vnfmRegisterInfo);
esrSystemInfo = extsysUtil.getEsrSystemInfoListFromAuthInfo(authInfo);
esrVnfm.setEsrSystemInfoList(esrSystemInfo);
*/
private EsrSystemInfo getAuthInfoFromVnfmRegisterInfo(VnfmRegisterInfo vnfmRegisterInfo) {
EsrSystemInfo authInfo = new EsrSystemInfo();
- authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
+ authInfo.setEsrSystemInfoId(extsysUtil.generateId());
authInfo.setSystemName(vnfmRegisterInfo.getName());
authInfo.setType(vnfmRegisterInfo.getType());
authInfo.setVendor(vnfmRegisterInfo.getVendor());
import java.util.ArrayList;
-import javax.inject.Inject;
import javax.ws.rs.core.Response;
import org.onap.aai.esr.entity.aai.CloudRegionDetail;
import org.onap.aai.esr.entity.aai.EsrSystemInfo;
import org.onap.aai.esr.entity.rest.VimRegisterInfo;
import org.onap.aai.esr.entity.rest.VimRegisterResponse;
+import org.onap.aai.esr.exception.ExceptionUtil;
+import org.onap.aai.esr.exception.ExtsysException;
import org.onap.aai.esr.externalservice.aai.CloudRegionProxy;
import org.onap.aai.esr.externalservice.cloud.Tenant;
import org.onap.aai.esr.externalservice.cloud.VimManagerProxy;
import com.google.gson.Gson;
-
public class VimManagerWrapper {
private static VimManagerWrapper vimManagerWrapper;
private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
- @Inject
- private VimManagerUtil vimManagerUtil;
+ private static VimManagerUtil vimManagerUtil = new VimManagerUtil();
- @Inject
- private CloudRegionProxy cloudRegionProxy;
+ private static CloudRegionProxy cloudRegionProxy = new CloudRegionProxy();
- @Inject
- private ExtsysUtil extsysUtil;
+ private static ExtsysUtil extsysUtil = new ExtsysUtil();
/**
* get VimManagerWrapper instance.
tenant.setDefaultTenant(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getDefaultTenant());
try {
VimManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant);
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error("Update VIM by Multi-cloud failed !" + e.getMessage());
+ } catch (ExtsysException e) {
+ LOG.error("Update VIM by Multi-cloud failed !", e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
}
return Response.ok(result).build();
- } catch (Exception error) {
- error.printStackTrace();
- LOG.error("Register VIM failed !" + error.getMessage());
- return Response.serverError().build();
+ } catch (ExtsysException error) {
+ LOG.error("Register VIM failed !", error);
+ throw ExceptionUtil.buildExceptionResponse(error.getMessage());
}
}
result.setCloudOwner(cloudOwner);
result.setCloudRegionId(cloudRegionId);
return Response.ok(result).build();
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error("Update VIM failed !" + e.getMessage());
- return Response.serverError().build();
+ } catch (ExtsysException e) {
+ LOG.error("Update VIM failed !", e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
}
}
cloudRegionList = new Gson().fromJson(aaiVimList, CloudRegionList.class);
vimRegisterInfos = getVimDetailList(cloudRegionList);
return Response.ok(vimRegisterInfos).build();
- } catch (Exception error) {
- error.printStackTrace();
- LOG.error("Query vim list details failed !" + error.getMessage());
+ } catch (ExtsysException error) {
+ LOG.error("Query vim list details failed !", error);
return Response.ok(vimRegisterInfos).build();
}
cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
vim = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
return Response.ok(vim).build();
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (ExtsysException e) {
+ LOG.error("Query vim details by ID failed !", e);
return Response.ok(vim).build();
}
String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
registeredVimInfo = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
- } catch (Exception error) {
- error.printStackTrace();
+ } catch (ExtsysException error) {
LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = "
- + cloudRegionId + error.getMessage());
+ + cloudRegionId, error);
}
return registeredVimInfo;
}
String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
return cloudRegionDetail;
- } catch (Exception error) {
- error.printStackTrace();
+ } catch (ExtsysException error) {
LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = "
- + cloudRegionId + error.getMessage());
+ + cloudRegionId, error);
return null;
}
}
CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
cloudRegionDetail = queryCloudRegionDetail(cloudOwner, cloudRegionId);
String resourceVersion = cloudRegionDetail.getResourceVersion();
- if (resourceVersion != null) {
- try {
- cloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);
- return Response.noContent().build();
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error(
- "Delete cloud region from A&AI failed! cloud-owner = " + cloudOwner
- + ", cloud-region-id = " + cloudRegionId + "resouce-version:" + resourceVersion,
- e.getMessage());
- return Response.serverError().build();
- }
- } else {
- LOG.error("resouce-version is null ! Can not delete resouce from A&AI. ");
- return Response.serverError().build();
+ try {
+ cloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);
+ return Response.noContent().build();
+ } catch (ExtsysException e) {
+ LOG.error("Delete cloud region from A&AI failed! cloud-owner = " + cloudOwner
+ + ", cloud-region-id = " + cloudRegionId + "resouce-version:" + resourceVersion, e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
}
}
-
+
private CloudRegionDetail queryCloudRegionDetail (String cloudOwner, String cloudRegionId) {
CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
try {
String cloudRegionStr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
LOG.info("Response from AAI by query cloud region: " + cloudRegionStr);
cloudRegionDetail = new Gson().fromJson(cloudRegionStr, CloudRegionDetail.class);
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (ExtsysException e) {
LOG.error("Query EMS detail failed! cloud-owner = " + cloudOwner
- + ", cloud-region-id = " + cloudRegionId , e.getMessage());
+ + ", cloud-region-id = " + cloudRegionId , e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
}
return cloudRegionDetail;
}
Code Review / aai / esr-server.git / commitdiff