import org.onap.aai.esr.entity.rest.VimRegisterInfo;
import org.onap.aai.esr.entity.rest.VimRegisterResponse;
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 org.onap.aai.esr.util.ExtsysUtil;
import org.onap.aai.esr.util.VimManagerUtil;
import org.slf4j.Logger;
private static VimManagerWrapper vimManagerWrapper;
private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
private static VimManagerUtil vimManagerUtil = new VimManagerUtil();
+ private static ExtsysUtil extsysUtil = new ExtsysUtil();
/**
* get VimManagerWrapper instance.
public Response registerVim(VimRegisterInfo vimRegisterInfo) {
LOG.info(
- "Start register VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo));
+ "Start register VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
CloudRegionDetail cloudRegion = new CloudRegionDetail();
VimRegisterResponse result = new VimRegisterResponse();
cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
CloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion);
result.setCloudOwner(cloudOwner);
result.setCloudRegionId(cloudRegionId);
+ Tenant tenant = new Tenant();
+ 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());
+ }
return Response.ok(result).build();
} catch (Exception error) {
error.printStackTrace();
}
public Response updateVim(String cloudOwner, String cloudRegionId,VimRegisterInfo vimRegisterInfo) {
- LOG.info("Start update VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo));
+ LOG.info("Start update VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
VimRegisterResponse result = new VimRegisterResponse();
} catch (Exception error) {
error.printStackTrace();
LOG.error("Query vim list details failed !" + error.getMessage());
- return Response.ok().build();
+ return Response.ok(vimRegisterInfos).build();
}
}
return Response.ok(vim).build();
} catch (Exception e) {
e.printStackTrace();
- return Response.serverError().build();
+ return Response.ok(vim).build();
}
}
}
public Response delVim(String cloudOwner, String cloudRegionId) {
- // TODO
- return Response.noContent().build();
+ 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();
+ }
+ }
+
+ 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();
+ LOG.error("Query EMS detail failed! cloud-owner = " + cloudOwner
+ + ", cloud-region-id = " + cloudRegionId , e.getMessage());
+ }
+ return cloudRegionDetail;
}
}