summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
486ed42)
Change-Id: I477338e083b98f6cc2a80d068229d7c00181b0fc
Issue-ID: AAI-638
Signed-off-by: Lizi <li.zi30@zte.com.cn>
}
public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
}
public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
- if (isTest) {
-
- } else {
ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
IExternalSystem registerVnfmServiceproxy =
ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
IExternalSystem registerVnfmServiceproxy =
ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
public Response registerEms(EmsRegisterInfo emsRegisterInfo) {
CommonRegisterResponse result = new CommonRegisterResponse();
public Response registerEms(EmsRegisterInfo emsRegisterInfo) {
CommonRegisterResponse result = new CommonRegisterResponse();
- EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
- esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+ EsrEmsDetail esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
String emsId = esrEmsDetail.getEmsId();
try {
ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
String emsId = esrEmsDetail.getEmsId();
try {
ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
public Response updateEms(EmsRegisterInfo emsRegisterInfo, String emsId) {
CommonRegisterResponse result = new CommonRegisterResponse();
public Response updateEms(EmsRegisterInfo emsRegisterInfo, String emsId) {
CommonRegisterResponse result = new CommonRegisterResponse();
- EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
- esrEmsDetail = getNewEsrEmsDetail(emsRegisterInfo, emsId);
+ EsrEmsDetail esrEmsDetail = getNewEsrEmsDetail(emsRegisterInfo, emsId);
try {
ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
result.setId(emsId);
try {
ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
result.setId(emsId);
}
public Response delEms(String emsId) {
}
public Response delEms(String emsId) {
- EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
- esrEmsDetail = queryEsrEmsDetail(emsId);
+ EsrEmsDetail esrEmsDetail = queryEsrEmsDetail(emsId);
String resourceVersion = esrEmsDetail.getResourceVersion();
try {
ExternalSystemProxy.deleteEms(emsId, resourceVersion);
String resourceVersion = esrEmsDetail.getResourceVersion();
try {
ExternalSystemProxy.deleteEms(emsId, resourceVersion);
private List<EmsRegisterInfo> getEmsDetailList(EsrEmsList esrEms) {
List<EmsRegisterInfo> emsInfoList = new ArrayList<>();
private List<EmsRegisterInfo> getEmsDetailList(EsrEmsList esrEms) {
List<EmsRegisterInfo> emsInfoList = new ArrayList<>();
- EmsRegisterInfo emsInfo = new EmsRegisterInfo();
for (int i = 0; i < esrEms.getEsrEms().size(); i++) {
String emsId = esrEms.getEsrEms().get(i).getEmsId();
for (int i = 0; i < esrEms.getEsrEms().size(); i++) {
String emsId = esrEms.getEsrEms().get(i).getEmsId();
- emsInfo = queryEmsDetail(emsId);
+ EmsRegisterInfo emsInfo = queryEmsDetail(emsId);
if (emsInfo != null) {
emsInfoList.add(emsInfo);
}
if (emsInfo != null) {
emsInfoList.add(emsInfo);
}
}
private EsrEmsDetail getNewEsrEmsDetail(EmsRegisterInfo emsRegisterInfo, String emsId) {
}
private EsrEmsDetail getNewEsrEmsDetail(EmsRegisterInfo emsRegisterInfo, String emsId) {
- EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
- List<EsrSystemInfo> newEsrSysInfoList = new ArrayList<>();
- EsrSystemInfo newEsrSystemInfo = new EsrSystemInfo();
- EsrEmsDetail oriEsrEmsDetail = new EsrEmsDetail();
- List<EsrSystemInfo> oriEsrSysInfoList = new ArrayList<>();
- EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
-
- oriEsrEmsDetail = queryEsrEmsDetail(emsId);
- esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+ EsrEmsDetail oriEsrEmsDetail = queryEsrEmsDetail(emsId);
+ EsrEmsDetail esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
String emsResourceVersion = oriEsrEmsDetail.getResourceVersion();
esrEmsDetail.setResourceVersion(emsResourceVersion);
esrEmsDetail.setEmsId(emsId);
String emsResourceVersion = oriEsrEmsDetail.getResourceVersion();
esrEmsDetail.setResourceVersion(emsResourceVersion);
esrEmsDetail.setEmsId(emsId);
- newEsrSysInfoList = esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
- oriEsrSysInfoList = oriEsrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
+ List<EsrSystemInfo> newEsrSysInfoList = esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
+ List<EsrSystemInfo> oriEsrSysInfoList = oriEsrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
for (int i = 0; i < oriEsrSysInfoList.size(); i++) {
for (int i = 0; i < oriEsrSysInfoList.size(); i++) {
- originalEsrSystemInfo = oriEsrSysInfoList.get(i);
+ EsrSystemInfo originalEsrSystemInfo = oriEsrSysInfoList.get(i);
for (int j = 0; j < newEsrSysInfoList.size(); j++) {
for (int j = 0; j < newEsrSysInfoList.size(); j++) {
- newEsrSystemInfo = newEsrSysInfoList.get(j);
+ EsrSystemInfo newEsrSystemInfo = newEsrSysInfoList.get(j);
if (originalEsrSystemInfo.getSystemType().equals(newEsrSystemInfo.getSystemType())) {
esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j)
.setResouceVersion(originalEsrSystemInfo.getResouceVersion());
if (originalEsrSystemInfo.getSystemType().equals(newEsrSystemInfo.getSystemType())) {
esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j)
.setResouceVersion(originalEsrSystemInfo.getResouceVersion());
public Response registerVim(VimRegisterInfo vimRegisterInfo) {
LOG.info("Start register VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
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();
VimRegisterResponse result = new VimRegisterResponse();
- cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+ CloudRegionDetail cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
String cloudOwner = vimRegisterInfo.getCloudOwner();
String cloudRegionId = vimRegisterInfo.getCloudRegionId();
try {
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));
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();
VimRegisterResponse result = new VimRegisterResponse();
- cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo);
+ CloudRegionDetail cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo);
try {
cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail);
result.setCloudOwner(cloudOwner);
try {
cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail);
result.setCloudOwner(cloudOwner);
private List<VimRegisterInfo> getVimDetailList(CloudRegionList cloudRegionList) {
List<VimRegisterInfo> vimRegisterInfos = new ArrayList<>();
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();
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;
vimRegisterInfos.add(vimRegisterInfo);
}
return vimRegisterInfos;
}
private CloudRegionDetail getVimUpdateInfo(VimRegisterInfo vimRegisterInfo) {
}
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();
String cloudOwner = vimRegisterInfo.getCloudOwner();
String cloudRegionId = vimRegisterInfo.getCloudRegionId();
- originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
+ CloudRegionDetail originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
String resourceVersion = originalCloudRegionDetail.getResourceVersion();
String resourceVersion = originalCloudRegionDetail.getResourceVersion();
- cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+ CloudRegionDetail cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
if (resourceVersion != null) {
cloudRegionDetail.setResourceVersion(resourceVersion);
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)
cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
.setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId());
cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
}
public Response delVim(String cloudOwner, String cloudRegionId) {
}
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);
String resourceVersion = cloudRegionDetail.getResourceVersion();
try {
cloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);