Arik Hadas has uploaded a new change for review.
Change subject: core: move getActiveSnapshot to VmCommand
......................................................................
core: move getActiveSnapshot to VmCommand
Since we are going to use this method in other VM commands, it is moved
from RunVmCommand to VmCommand.
RunVmCommand#getSnapshotDao is also removed, and
AuditLogableBase#getSnapshotDAO is used instead.
Change-Id: I11213c49c3bbb7b733722bb9501d2616c09ae2e0
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
3 files changed, 11 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/36521/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
index e9d660e..b0245fb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
@@ -1007,7 +1007,8 @@
return StringUtils.EMPTY;
}
- private Snapshot getActiveSnapshot() {
+ @Override
+ protected Snapshot getActiveSnapshot() {
for (Snapshot snapshot : getVm().getSnapshots()) {
if (snapshot.getType() == SnapshotType.ACTIVE)
return snapshot;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
index 43008a5..0206f72 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
@@ -44,7 +44,6 @@
import org.ovirt.engine.core.common.businessentities.InitializationType;
import org.ovirt.engine.core.common.businessentities.Provider;
import org.ovirt.engine.core.common.businessentities.RepoImage;
-import org.ovirt.engine.core.common.businessentities.Snapshot;
import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
@@ -75,7 +74,6 @@
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dal.job.ExecutionMessageDirector;
-import org.ovirt.engine.core.dao.SnapshotDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -156,14 +154,6 @@
}
return cachedMemoryVolumeFromSnapshot;
- }
-
- private Snapshot getActiveSnapshot() {
- return getSnapshotDao().get(getVm().getId(), SnapshotType.ACTIVE);
- }
-
- private SnapshotDao getSnapshotDao() {
- return getDbFacade().getSnapshotDao();
}
/**
@@ -354,7 +344,7 @@
*/
protected boolean isStatelessSnapshotExistsForVm() {
if (cachedStatelessSnapshotExistsForVm == null) {
- cachedStatelessSnapshotExistsForVm =
getSnapshotDao().exists(getVm().getId(), SnapshotType.STATELESS);
+ cachedStatelessSnapshotExistsForVm =
getSnapshotDAO().exists(getVm().getId(), SnapshotType.STATELESS);
}
return cachedStatelessSnapshotExistsForVm;
}
@@ -1058,10 +1048,10 @@
}
// If the active snapshot is the only one that points to the memory
volume we can remove it
- if
(getSnapshotDao().getNumOfSnapshotsByMemory(cachedMemoryVolumeFromSnapshot) ==
1) {
+ if
(getSnapshotDAO().getNumOfSnapshotsByMemory(cachedMemoryVolumeFromSnapshot) ==
1) {
removeMemoryVolumes(cachedMemoryVolumeFromSnapshot,
getActionType(), true);
}
- getSnapshotDao().removeMemoryFromActiveSnapshot(getVmId());
+ getSnapshotDAO().removeMemoryFromActiveSnapshot(getVmId());
}
/**
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 e81e20b..907a1df 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
@@ -19,11 +19,13 @@
import org.ovirt.engine.core.common.businessentities.Disk;
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.DiskInterface;
+import org.ovirt.engine.core.common.businessentities.Snapshot;
import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.common.businessentities.VmPayload;
import org.ovirt.engine.core.common.businessentities.VmStatic;
+import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType;
import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType;
import org.ovirt.engine.core.common.businessentities.network.VmNic;
import org.ovirt.engine.core.common.config.Config;
@@ -586,4 +588,8 @@
protected boolean shouldSkipCommandExecution() {
return false;
}
+
+ protected Snapshot getActiveSnapshot() {
+ return getSnapshotDAO().get(getVm().getId(), SnapshotType.ACTIVE);
+ }
}
--
To view, visit http://gerrit.ovirt.org/36521
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11213c49c3bbb7b733722bb9501d2616c09ae2e0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
