Mike Kolesnik has uploaded a new change for review.
Change subject: engine: Lazily initialize VM interfaces list
......................................................................
engine: Lazily initialize VM interfaces list
In order to deallocate vNICs from external networks, the interfaces list
for the VM is necessary. Therefore, the interfaces list will be
initialized lazily.
Change-Id: Ib2c08ea82134b398344dfed41e5000de2fe98a74
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
1 file changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/19964/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
index 2dc56d8..295cb49 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
@@ -106,6 +106,7 @@
public final static int MAX_PCI_SLOTS = 26;
// 3 IDE slots: 4 total minus 1 for CD
public final static int MAX_IDE_SLOTS = 3;
+ private List<VmNic> interfaces;
/**
* This method checks that with the given parameters, the max PCI and IDE
limits defined are not passed.
@@ -160,10 +161,17 @@
getVmStaticDAO().remove(getVmId());
}
+ protected List<VmNic> getInterfaces() {
+ if (interfaces == null) {
+ interfaces = getVmNicDao().getAllForVm(getVmId());
+ }
+
+ return interfaces;
+ }
+
protected void removeVmNetwork() {
- List<VmNic> interfaces = getVmNicDao().getAllForVm(getVmId());
- if (interfaces != null) {
- for (VmNic iface : interfaces) {
+ if (getInterfaces() != null) {
+ for (VmNic iface : getInterfaces()) {
MacPoolManager.getInstance().freeMac(iface.getMacAddress());
}
}
--
To view, visit http://gerrit.ovirt.org/19964
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2c08ea82134b398344dfed41e5000de2fe98a74
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
