import java.util.ArrayList;
+import javax.inject.Inject;
import javax.ws.rs.core.Response;
import org.onap.aai.esr.entity.aai.CloudRegionDetail;
private static VimManagerWrapper vimManagerWrapper;
private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
- private static VimManagerUtil vimManagerUtil = new VimManagerUtil();
+
+ @Inject
+ private VimManagerUtil vimManagerUtil;
+
+ @Inject
+ private CloudRegionProxy cloudRegionProxy;
+
+ @Inject
+ private ExtsysUtil 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);
String cloudOwner = vimRegisterInfo.getCloudOwner();
String cloudRegionId = vimRegisterInfo.getCloudRegionId();
try {
- CloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion);
+ cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion);
result.setCloudOwner(cloudOwner);
result.setCloudRegionId(cloudRegionId);
Tenant tenant = new Tenant();
}
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();
cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo);
try {
- CloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail);
+ cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail);
result.setCloudOwner(cloudOwner);
result.setCloudRegionId(cloudRegionId);
return Response.ok(result).build();
ArrayList<VimRegisterInfo> vimRegisterInfos = new ArrayList<VimRegisterInfo>();
CloudRegionList cloudRegionList = new CloudRegionList();
try {
- String aaiVimList = CloudRegionProxy.qureyVimList();
+ String aaiVimList = cloudRegionProxy.qureyVimList();
cloudRegionList = new Gson().fromJson(aaiVimList, CloudRegionList.class);
vimRegisterInfos = getVimDetailList(cloudRegionList);
return Response.ok(vimRegisterInfos).build();
VimRegisterInfo vim = new VimRegisterInfo();
CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
try {
- String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
+ String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
LOG.info("Response from AAI by query VIM: " + cloudRegionstr);
cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
vim = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
VimRegisterInfo registeredVimInfo = new VimRegisterInfo();
try {
- String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
+ String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
registeredVimInfo = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
} catch (Exception error) {
private CloudRegionDetail getOriginalCloudRegion(String cloudOwner, String cloudRegionId) {
CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
try {
- String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
+ String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
return cloudRegionDetail;
} catch (Exception error) {
String resourceVersion = cloudRegionDetail.getResourceVersion();
if (resourceVersion != null) {
try {
- CloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);
+ cloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);
return Response.noContent().build();
} catch (Exception e) {
e.printStackTrace();
private CloudRegionDetail queryCloudRegionDetail (String cloudOwner, String cloudRegionId) {
CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
try {
- String cloudRegionStr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
+ 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) {