[Engine-patches] Change in ovirt-engine[ovirt-engine-3.4]: core: add helper method for template version

[ofrenkel]

Omer Frenkel has uploaded a new change for review.

Change subject: core: add helper method for template version
......................................................................

core: add helper method for template version

some places in addVmTemplate command are checking for
baseTemplateId==null to understand if we add base template or template
version.

this patch encapsulate this logic into a method with a clear name.

Change-Id: I25229303fcee443191be1f2a1de84be345f96aff
Signed-off-by: Omer Frenkel <ofren...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/26698/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index a95e907..c6fcdca 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -215,7 +215,7 @@
         getParameters().setEntityInfo(new EntityInfo(VdcObjectType.VmTemplate, 
getVmTemplateId()));
 
         // set template id as base for new templates
-        if (getParameters().getBaseTemplateId() == null) {
+        if (!isTemplateVersion()) {
             getParameters().setBaseTemplateId(getVmTemplateId());
             if (StringUtils.isEmpty(getParameters().getTemplateVersionName())) 
{
                 
getParameters().setTemplateVersionName(BASE_TEMPLATE_VERSION_NAME);
@@ -360,7 +360,7 @@
             }
         }
 
-        if (getParameters().getBaseTemplateId() != null) {
+        if (isTemplateVersion()) {
             VmTemplate userSelectedBaseTemplate = 
getVmTemplateDAO().get(getParameters().getBaseTemplateId());
             if (userSelectedBaseTemplate == null) {
                 return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST);
@@ -374,6 +374,10 @@
         return imagesRelatedChecks() && 
AddVmCommand.checkCpuSockets(getParameters().getMasterVm().getNumOfSockets(),
                 getParameters().getMasterVm().getCpuPerSocket(), getVdsGroup()
                 .getcompatibility_version().toString(), 
getReturnValue().getCanDoActionMessages());
+    }
+
+    private boolean isTemplateVersion() {
+        return getParameters().getBaseTemplateId() != null;
     }
 
     private boolean imagesRelatedChecks() {
@@ -600,7 +604,7 @@
         endUnlockOps();
 
         // in case of new version of a template, update vms marked to use 
latest
-        if (getParameters().getBaseTemplateId() != null) {
+        if (isTemplateVersion()) {
             String jobId = 
SchedulerUtilQuartzImpl.getInstance().scheduleAOneTimeJob(this, 
"onTimerHandleVdsRecovering", new Class[0],
                     new Object[0], 0, TimeUnit.SECONDS);
             updateVmsJobIdMap.put(getParameters().getBaseTemplateId(), jobId);
@@ -775,7 +779,7 @@
 
     @Override
     protected Map<String, Pair<String, String>> getSharedLocks() {
-        if (getParameters().getBaseTemplateId() != null) {
+        if (isTemplateVersion()) {
             return 
Collections.singletonMap(getParameters().getBaseTemplateId().toString(),
                 LockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, 
VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED));
         }


-- 
To view, visit http://gerrit.ovirt.org/26698
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25229303fcee443191be1f2a1de84be345f96aff
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Omer Frenkel <ofren...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches