[Engine-patches] Change in ovirt-engine[master]: core: minor cleanup in change disk can-do-action msgs

[ofrenkel]

Omer Frenkel has uploaded a new change for review.

Change subject: core: minor cleanup in change disk can-do-action msgs
......................................................................

core: minor cleanup in change disk can-do-action msgs

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/32127/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java
index 6da4173..5503a60 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java
@@ -16,6 +16,7 @@
 
     public ChangeDiskCommand(T parameters) {
         super(parameters);
+        cdImagePath = getParameters().getCdImagePath();
     }
 
     public String getDiskName() {
@@ -24,7 +25,12 @@
 
     @Override
     protected void setActionMessageParameters() {
-        addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CHANGE_CD);
+        // An empty 'cdImagePath' means eject CD
+        if (!StringUtils.isEmpty(cdImagePath)) {
+            addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CHANGE_CD);
+        } else {
+            addCanDoActionMessage(VdcBllMessages.VAR__ACTION__EJECT_CD);
+        }
         addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM);
     }
 
@@ -38,28 +44,16 @@
             return false;
         }
 
-        cdImagePath = getParameters().getCdImagePath();
-
         if (!getVm().isRunningOrPaused()) {
-            addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM);
-
-            // An empty 'cdImagePath' means eject CD
-            if (!StringUtils.isEmpty(cdImagePath)) {
-                addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CHANGE_CD);
-            } else {
-                addCanDoActionMessage(VdcBllMessages.VAR__ACTION__EJECT_CD);
-            }
             return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, 
LocalizedVmStatus.from(getVm().getStatus()));
         }
 
         if 
((IsoDomainListSyncronizer.getInstance().findActiveISODomain(getVm().getStoragePoolId())
 == null)
                 && !StringUtils.isEmpty(cdImagePath)) {
-            addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CHANGE_CD);
             return 
failCanDoAction(VdcBllMessages.VM_CANNOT_WITHOUT_ACTIVE_STORAGE_DOMAIN_ISO);
         }
 
         if (StringUtils.isNotEmpty(cdImagePath) && 
!cdImagePath.endsWith(ValidationUtils.ISO_SUFFIX)) {
-            addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CHANGE_CD);
             return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_INVALID_CDROM_DISK_FORMAT);
         }
 


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

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