Muli Salem has uploaded a new change for review. Change subject: core: PlugUnplug to ActivateDeactivate (#850854) ......................................................................
core: PlugUnplug to ActivateDeactivate (#850854) https://bugzilla.redhat.com/850854 This patch changes the name of PlugUnplugVmNicCommand to ActivateDeactivateVmNicCommand, since this is what the command does. Change-Id: I9a879dca5c0303c0e25c76a2bc4bf1046578679a Signed-off-by: Muli Salem <[email protected]> --- R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java R backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ActivateDeactivateVmNicParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 13 files changed, 46 insertions(+), 46 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/7667/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PlugUnplugVmNicCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java similarity index 87% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PlugUnplugVmNicCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java index 407490f..c5dc911 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PlugUnplugVmNicCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java @@ -3,8 +3,8 @@ import java.util.List; import org.ovirt.engine.core.bll.utils.VmDeviceUtils; +import org.ovirt.engine.core.common.action.ActivateDeactivateVmNicParameters; import org.ovirt.engine.core.common.action.PlugAction; -import org.ovirt.engine.core.common.action.PlugUnplugVmNicParameters; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.VmDevice; @@ -19,15 +19,15 @@ import org.ovirt.engine.core.utils.transaction.TransactionSupport; /** - * Attach or detach a virtual network interface to the VM in case it is in a valid status. If the VM is down, simply + * Activate or deactivate a virtual network interface of a VM in case it is in a valid status. If the VM is down, simply * update the device, if it is Up - HotPlug / HotUnPlug the virtual network interface */ @NonTransactiveCommandAttribute -public class PlugUnplugVmNicCommand<T extends PlugUnplugVmNicParameters> extends VmCommand<T> { +public class ActivateDeactivateVmNicCommand<T extends ActivateDeactivateVmNicParameters> extends VmCommand<T> { private VmDevice vmDevice; - public PlugUnplugVmNicCommand(T parameters) { + public ActivateDeactivateVmNicCommand(T parameters) { super(parameters); setVmId(parameters.getVmId()); } @@ -37,17 +37,17 @@ boolean returnValue = true; if (isActivateDeactivateAllowedForVmStatus(getVm().getstatus())) { - // HotPlug in the host needs to be called only if the Vm is UP + // Hot activation in the host needs to be called only if the Vm is UP if (VmHandler.isHotPlugNicAllowedForVmStatus(getVm().getstatus())) { setVdsId(getVm().getrun_on_vds().getValue()); returnValue = canPerformHotPlug(); if (returnValue && !networkAttachedToVds(getNetworkName(), getVdsId())) { - addCanDoActionMessage(VdcBllMessages.PLUG_UNPLUG_NETWORK_NOT_IN_VDS); + addCanDoActionMessage(VdcBllMessages.ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS); returnValue = false; } } } else { - addCanDoActionMessage(VdcBllMessages.PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL); + addCanDoActionMessage(VdcBllMessages.ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL); returnValue = false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java index cdf6c2d..6f22d92 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java @@ -9,9 +9,9 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; +import org.ovirt.engine.core.common.action.ActivateDeactivateVmNicParameters; import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; import org.ovirt.engine.core.common.action.PlugAction; -import org.ovirt.engine.core.common.action.PlugUnplugVmNicParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.businessentities.ActionGroup; @@ -79,7 +79,7 @@ boolean succeeded = true; if (getParameters().getInterface().isActive()) { - succeeded = plugNic(); + succeeded = activateNic(); } setSucceeded(succeeded); } @@ -101,26 +101,26 @@ getCompensationContext().snapshotNewEntity(vmNetworkInterface.getStatistics()); } - private boolean plugNic() { - PlugUnplugVmNicParameters plugParameters = createPlugUnPlugParameters(); - VdcReturnValueBase plugVmNicReturnValue = - Backend.getInstance().runInternalAction(VdcActionType.PlugUnplugVmNic, - plugParameters, + private boolean activateNic() { + ActivateDeactivateVmNicParameters activateParameters = createActivateDeactivateParameters(); + VdcReturnValueBase activateVmNicReturnValue = + Backend.getInstance().runInternalAction(VdcActionType.ActivateDeactivateVmNic, + activateParameters, ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); - if (!plugVmNicReturnValue.getSucceeded()) { - getReturnValue().getExecuteFailedMessages().add("Failed hot-plugging nic to VM"); - getReturnValue().getCanDoActionMessages().addAll(plugVmNicReturnValue.getCanDoActionMessages()); + if (!activateVmNicReturnValue.getSucceeded()) { + getReturnValue().getExecuteFailedMessages().add("Failed activating nic."); + getReturnValue().getCanDoActionMessages().addAll(activateVmNicReturnValue.getCanDoActionMessages()); getReturnValue().getCanDoActionMessages().remove(VdcBllMessages.VAR__ACTION__ADD.name()); getReturnValue().setCanDoAction(false); } - return plugVmNicReturnValue.getSucceeded(); + return activateVmNicReturnValue.getSucceeded(); } - private PlugUnplugVmNicParameters createPlugUnPlugParameters() { - PlugUnplugVmNicParameters plugUnplugVmNicParameters = - new PlugUnplugVmNicParameters(getParameters().getInterface().getId(), PlugAction.PLUG); - plugUnplugVmNicParameters.setVmId(getParameters().getVmId()); - return plugUnplugVmNicParameters; + private ActivateDeactivateVmNicParameters createActivateDeactivateParameters() { + ActivateDeactivateVmNicParameters activateDeactivateVmNicParameters = + new ActivateDeactivateVmNicParameters(getParameters().getInterface().getId(), PlugAction.PLUG); + activateDeactivateVmNicParameters.setVmId(getParameters().getVmId()); + return activateDeactivateVmNicParameters; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PlugUnplugVmNicParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ActivateDeactivateVmNicParameters.java similarity index 76% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PlugUnplugVmNicParameters.java rename to backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ActivateDeactivateVmNicParameters.java index d88d98c..f3670ce 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PlugUnplugVmNicParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ActivateDeactivateVmNicParameters.java @@ -2,12 +2,12 @@ import org.ovirt.engine.core.compat.Guid; -public class PlugUnplugVmNicParameters extends VmOperationParameterBase { +public class ActivateDeactivateVmNicParameters extends VmOperationParameterBase { private Guid nicId; private PlugAction action; - public PlugUnplugVmNicParameters(Guid nicId, PlugAction action) { + public ActivateDeactivateVmNicParameters(Guid nicId, PlugAction action) { super(); this.nicId = nicId; this.action = action; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java index 4d12689..18c731d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java @@ -49,7 +49,7 @@ ImportVmTemplate(39, ActionGroup.IMPORT_EXPORT_VM), ChangeVMCluster(40, ActionGroup.EDIT_VM_PROPERTIES, false), CancelMigrateVm(41, ActionGroup.MIGRATE_VM, false), - PlugUnplugVmNic(42, ActionGroup.CONFIGURE_VM_NETWORK, false), + ActivateDeactivateVmNic(42, ActionGroup.CONFIGURE_VM_NETWORK, false), // powerclient 4.2 PowerClientMigrateOnConnectCheck(50), diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java index edca168..d6dc9fd 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java @@ -583,8 +583,8 @@ HOT_PLUG_DISK_IS_NOT_VIRTIO, HOT_PLUG_DISK_IS_NOT_UNPLUGGED, HOT_UNPLUG_DISK_IS_NOT_PLUGGED, - PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL, - PLUG_UNPLUG_NETWORK_NOT_IN_VDS, + ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL, + ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS, SHAREABLE_DISK_IS_NOT_SUPPORTED_FOR_DISK, SHAREABLE_DISK_IS_NOT_SUPPORTED_BY_VOLUME_FORMAT, ERROR_CANNOT_DETACH_DISK_WITH_SNAPSHOT, diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 420261c..f3450f4 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -693,8 +693,8 @@ HOT_PLUG_DISK_IS_NOT_VIRTIO=Can plug only virtIO disks. HOT_PLUG_DISK_IS_NOT_UNPLUGGED=Disk is already activated. HOT_UNPLUG_DISK_IS_NOT_PLUGGED=Disk is already deactivated. -PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. -PLUG_UNPLUG_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network. +ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. +ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network. VM_CANNOT_RUN_FROM_DISK_WITHOUT_PLUGGED_DISK=Cannot ${action} ${type} without at least one active disk.\nPlease activate a disk and rerun the VM. SHAREABLE_DISK_IS_NOT_SUPPORTED_FOR_DISK=Cannot ${action} ${type}. Disk cannot be shareable if it depends on a snapshot. In order to share it, remove the disk's snapshots. SHAREABLE_DISK_IS_NOT_SUPPORTED_BY_VOLUME_FORMAT=Cannot ${action} ${type}. Disk's volume format is not supported for shareable disk. diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java index be9c210..fae39a3 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java @@ -9,7 +9,7 @@ import org.ovirt.engine.api.model.Nics; import org.ovirt.engine.api.resource.ActionResource; import org.ovirt.engine.api.resource.VmNicResource; -import org.ovirt.engine.core.common.action.PlugUnplugVmNicParameters; +import org.ovirt.engine.core.common.action.ActivateDeactivateVmNicParameters; import org.ovirt.engine.core.common.action.PlugAction; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; @@ -120,17 +120,17 @@ @Override public Response activate(Action action) { - PlugUnplugVmNicParameters params = new PlugUnplugVmNicParameters(guid, PlugAction.PLUG); + ActivateDeactivateVmNicParameters params = new ActivateDeactivateVmNicParameters(guid, PlugAction.PLUG); BackendNicsResource parent = (BackendNicsResource) collection; params.setVmId(parent.parentId); - return doAction(VdcActionType.PlugUnplugVmNic, params, action); + return doAction(VdcActionType.ActivateDeactivateVmNic, params, action); } @Override public Response deactivate(Action action) { - PlugUnplugVmNicParameters params = new PlugUnplugVmNicParameters(guid, PlugAction.UNPLUG); + ActivateDeactivateVmNicParameters params = new ActivateDeactivateVmNicParameters(guid, PlugAction.UNPLUG); params.setVmId(((BackendNicsResource) collection).parentId); - return doAction(VdcActionType.PlugUnplugVmNic, params, action); + return doAction(VdcActionType.ActivateDeactivateVmNic, params, action); } @Override diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index c84dadf..18da34c 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -1856,10 +1856,10 @@ String HOT_PLUG_DISK_IS_NOT_UNPLUGGED(); @DefaultStringValue("Cannot activate/deactivate interface due to VM status. The VM status must be Down or Up.") - String PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL(); + String ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL(); @DefaultStringValue("The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network.") - String PLUG_UNPLUG_NETWORK_NOT_IN_VDS(); + String ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS(); @DefaultStringValue("Disk is already deactivated.") String HOT_UNPLUG_DISK_IS_NOT_PLUGGED(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java index 63e013f..0722f99 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java @@ -4,7 +4,7 @@ import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; -import org.ovirt.engine.core.common.action.PlugUnplugVmNicParameters; +import org.ovirt.engine.core.common.action.ActivateDeactivateVmNicParameters; import org.ovirt.engine.core.common.action.PlugAction; import org.ovirt.engine.core.common.action.RemoveVmInterfaceParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -471,12 +471,12 @@ VmNetworkInterface nic = (VmNetworkInterface)item; nic.setActive(activate); - PlugUnplugVmNicParameters params = new PlugUnplugVmNicParameters(nic.getId(), activate?PlugAction.PLUG:PlugAction.UNPLUG); + ActivateDeactivateVmNicParameters params = new ActivateDeactivateVmNicParameters(nic.getId(), activate?PlugAction.PLUG:PlugAction.UNPLUG); params.setVmId(vm.getId()); paramerterList.add(params); } - Frontend.RunMultipleAction(VdcActionType.PlugUnplugVmNic, paramerterList, + Frontend.RunMultipleAction(VdcActionType.ActivateDeactivateVmNic, paramerterList, new IFrontendMultipleActionAsyncCallback() { @Override public void Executed(FrontendMultipleActionAsyncResult result) { diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java index bbd2a03..28af46c 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java @@ -330,7 +330,7 @@ String VdcActionType___HibernateVm(); - String VdcActionType___PlugUnplugVmNic(); + String VdcActionType___ActivateDeactivateVmNic(); String VdcActionType___LoginAdminUser(); diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties index 4b95b80..56da7bf 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties @@ -161,7 +161,7 @@ VdcActionType___DetachVmPoolFromAdGroup=Detach Group from VM Pool VdcActionType___DetachVmPoolFromUser=Detach User from VM Pool VdcActionType___HibernateVm=Suspend VM -VdcActionType___PlugUnplugVmNic=Activate/Deactivate Interface +VdcActionType___ActivateDeactivateVmNic=Activate/Deactivate Interface VdcActionType___LoginAdminUser=Login as administrator VdcActionType___MaintananceNumberOfVdss=Move Host to Maintenance mode VdcActionType___MergeSnapshot=Merge Snapshots diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 24bc75d..601dcfa 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -687,8 +687,8 @@ HOT_PLUG_DISK_IS_NOT_VIRTIO=Can plug only virtIO disks. HOT_PLUG_DISK_IS_NOT_UNPLUGGED=Disk is already activated. HOT_UNPLUG_DISK_IS_NOT_PLUGGED=Disk is already deactivated. -PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. -PLUG_UNPLUG_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network. +ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. +ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network. VM_CANNOT_RUN_FROM_DISK_WITHOUT_PLUGGED_DISK=Cannot ${action} ${type} without at least one active disk.\nPlease activate a disk and rerun the VM. SHAREABLE_DISK_IS_NOT_SUPPORTED_FOR_DISK=Cannot ${action} ${type}. Disk cannot be shareable if it depends on a snapshot. In order to share it, remove the disk's snapshots. SHAREABLE_DISK_IS_NOT_SUPPORTED_BY_VOLUME_FORMAT=Cannot ${action} ${type}. Disk's volume format is not supported for shareable disk. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index c47ec24..f9435ae 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -687,8 +687,8 @@ HOT_PLUG_DISK_IS_NOT_VIRTIO=Can plug only virtIO disks. HOT_PLUG_DISK_IS_NOT_UNPLUGGED=Disk is already activated. HOT_UNPLUG_DISK_IS_NOT_PLUGGED=Disk is already deactivated. -PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. -PLUG_UNPLUG_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network. +ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. +ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network. VM_CANNOT_RUN_FROM_DISK_WITHOUT_PLUGGED_DISK=Cannot ${action} ${type} without at least one active disk.\nPlease activate a disk and rerun the VM. SHAREABLE_DISK_IS_NOT_SUPPORTED_FOR_DISK=Cannot ${action} ${type}. Disk cannot be shareable if it depends on a snapshot. In order to share it, remove the disk's snapshots. SHAREABLE_DISK_IS_NOT_SUPPORTED_BY_VOLUME_FORMAT=Cannot ${action} ${type}. Disk's volume format is not supported for shareable disk. -- To view, visit http://gerrit.ovirt.org/7667 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a879dca5c0303c0e25c76a2bc4bf1046578679a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
