/**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2018 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import javax.ws.rs.core.Response;
import org.onap.aai.esr.entity.aai.CloudRegionDetail;
import org.onap.aai.esr.entity.aai.CloudRegionList;
+import org.onap.aai.esr.entity.aai.ComplexList;
import org.onap.aai.esr.entity.aai.EsrSystemInfo;
import org.onap.aai.esr.entity.rest.VimRegisterInfo;
import org.onap.aai.esr.entity.rest.VimRegisterResponse;
*/
public static VimManagerWrapper getInstance() {
if (vimManagerWrapper == null) {
- vimManagerWrapper = new VimManagerWrapper();
+ vimManagerWrapper = new VimManagerWrapper(cloudRegionProxy);
}
return vimManagerWrapper;
-
+ }
+
+ public VimManagerWrapper(CloudRegionProxy cloudRegionProxy) {
+ VimManagerWrapper.cloudRegionProxy = cloudRegionProxy;
}
public Response registerVim(VimRegisterInfo vimRegisterInfo) {
LOG.info("Start register VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
- CloudRegionDetail cloudRegion = new CloudRegionDetail();
VimRegisterResponse result = new VimRegisterResponse();
- cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+ CloudRegionDetail cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
String cloudOwner = vimRegisterInfo.getCloudOwner();
String cloudRegionId = vimRegisterInfo.getCloudRegionId();
try {
public Response updateVim(String cloudOwner, String cloudRegionId, VimRegisterInfo vimRegisterInfo) {
LOG.info("Start update VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
- CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
VimRegisterResponse result = new VimRegisterResponse();
- cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo);
+ CloudRegionDetail cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo);
try {
cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail);
result.setCloudOwner(cloudOwner);
private List<VimRegisterInfo> getVimDetailList(CloudRegionList cloudRegionList) {
List<VimRegisterInfo> vimRegisterInfos = new ArrayList<>();
- VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
int cloudRegionNum = cloudRegionList.getCloudRegion().size();
for (int i = 0; i < cloudRegionNum; i++) {
String cloudOwner = cloudRegionList.getCloudRegion().get(i).getCloudOwner();
String cloudRegionId = cloudRegionList.getCloudRegion().get(i).getCloudRegionId();
- vimRegisterInfo = getVimDetail(cloudOwner, cloudRegionId);
+ VimRegisterInfo vimRegisterInfo = getVimDetail(cloudOwner, cloudRegionId);
vimRegisterInfos.add(vimRegisterInfo);
}
return vimRegisterInfos;
}
private CloudRegionDetail getVimUpdateInfo(VimRegisterInfo vimRegisterInfo) {
- CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
- CloudRegionDetail originalCloudRegionDetail = new CloudRegionDetail();
- EsrSystemInfo originalSystemInfo = new EsrSystemInfo();
String cloudOwner = vimRegisterInfo.getCloudOwner();
String cloudRegionId = vimRegisterInfo.getCloudRegionId();
- originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
+ CloudRegionDetail originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
String resourceVersion = originalCloudRegionDetail.getResourceVersion();
- cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+ CloudRegionDetail cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
if (resourceVersion != null) {
cloudRegionDetail.setResourceVersion(resourceVersion);
- originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
+ EsrSystemInfo originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
.setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId());
cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
}
public Response delVim(String cloudOwner, String cloudRegionId) {
- CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
- cloudRegionDetail = queryCloudRegionDetail(cloudOwner, cloudRegionId);
+ CloudRegionDetail cloudRegionDetail = queryCloudRegionDetail(cloudOwner, cloudRegionId);
String resourceVersion = cloudRegionDetail.getResourceVersion();
try {
cloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);
}
return cloudRegionDetail;
}
+
+ public Response queryComplexes() {
+ ComplexList complexList = new ComplexList();
+ List<String> complexId = new ArrayList<>();
+ try {
+ String complexesString = cloudRegionProxy.qureyComplexes();
+ LOG.info("The complex query result is: " + complexesString);
+ complexList = new Gson().fromJson(complexesString, ComplexList.class);
+ for (int i=0; i<complexList.getComplex().size(); i++) {
+ complexId.add(complexList.getComplex().get(i).getPhysicalLocationId());
+ }
+ } catch (ExtsysException e) {
+ LOG.error("Query vim details by ID failed !", e);
+ }
+ return Response.ok(complexId).build();
+ }
}