Code Review
/
aai
/
esr-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add unit test for the newly API."
[aai/esr-server.git]
/
esr-mgr
/
src
/
main
/
java
/
org
/
onap
/
aai
/
esr
/
wrapper
/
VimManagerWrapper.java
diff --git
a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
index
3003159
..
82c6f77
100644
(file)
--- a/
esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
+++ b/
esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
@@
-46,6
+46,8
@@
public class VimManagerWrapper {
private static VimManagerUtil vimManagerUtil = new VimManagerUtil();
private static CloudRegionProxy cloudRegionProxy = new CloudRegionProxy();
private static VimManagerUtil vimManagerUtil = new VimManagerUtil();
private static CloudRegionProxy cloudRegionProxy = new CloudRegionProxy();
+
+ private static VimManagerProxy vimManagerProxy = new VimManagerProxy();
private static ExtsysUtil extsysUtil = new ExtsysUtil();
private static ExtsysUtil extsysUtil = new ExtsysUtil();
@@
-56,13
+58,14
@@
public class VimManagerWrapper {
*/
public static VimManagerWrapper getInstance() {
if (vimManagerWrapper == null) {
*/
public static VimManagerWrapper getInstance() {
if (vimManagerWrapper == null) {
- vimManagerWrapper = new VimManagerWrapper(cloudRegionProxy);
+ vimManagerWrapper = new VimManagerWrapper(cloudRegionProxy
, vimManagerProxy
);
}
return vimManagerWrapper;
}
}
return vimManagerWrapper;
}
- public VimManagerWrapper(CloudRegionProxy cloudRegionProxy) {
+ public VimManagerWrapper(CloudRegionProxy cloudRegionProxy
, VimManagerProxy vimManagerProxy
) {
VimManagerWrapper.cloudRegionProxy = cloudRegionProxy;
VimManagerWrapper.cloudRegionProxy = cloudRegionProxy;
+ VimManagerWrapper.vimManagerProxy = vimManagerProxy;
}
public Response registerVim(VimRegisterInfo vimRegisterInfo) {
}
public Response registerVim(VimRegisterInfo vimRegisterInfo) {
@@
-91,7
+94,7
@@
public class VimManagerWrapper {
Tenant tenant = new Tenant();
tenant.setDefaultTenant(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getDefaultTenant());
try {
Tenant tenant = new Tenant();
tenant.setDefaultTenant(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getDefaultTenant());
try {
-
V
imManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant);
+
v
imManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant);
} catch (ExtsysException e) {
LOG.error("Update VIM by Multi-cloud failed !", e);
}
} catch (ExtsysException e) {
LOG.error("Update VIM by Multi-cloud failed !", e);
}