Muli Salem has uploaded a new change for review. Change subject: core: Changing Command Name to be Accurate (#850854) ......................................................................
core: Changing Command Name to be Accurate (#850854) https://bugzilla.redhat.com/850854 Since the HotPlugUnplugVmNicCommand does not necessarily perform hotplug, changing the command name accordingly. Signed-off-by: Muli Salem <[email protected]> Change-Id: I3504be61ba4ad7bd53d1bf188ee9367310b8f9c0 --- R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PlugUnplugVmNicCommand.java R backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PlugUnplugVmNicParameters.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 12 files changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/7527/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugUnplugVmNicCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PlugUnplugVmNicCommand.java similarity index 91% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugUnplugVmNicCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PlugUnplugVmNicCommand.java index a7dc221..f4ae0d9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugUnplugVmNicCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PlugUnplugVmNicCommand.java @@ -1,8 +1,8 @@ package org.ovirt.engine.core.bll; import org.ovirt.engine.core.bll.utils.VmDeviceUtils; -import org.ovirt.engine.core.common.action.HotPlugUnplugVmNicParameters; 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.VmDevice; import org.ovirt.engine.core.common.businessentities.VmDeviceId; @@ -17,11 +17,11 @@ * update the device, if it is Up - HotPlug / HotUnPlug the virtual network interface */ @NonTransactiveCommandAttribute -public class HotPlugUnplugVmNicCommand<T extends HotPlugUnplugVmNicParameters> extends VmCommand<T> { +public class PlugUnplugVmNicCommand<T extends PlugUnplugVmNicParameters> extends VmCommand<T> { private VmDevice vmDevice; - public HotPlugUnplugVmNicCommand(T parameters) { + public PlugUnplugVmNicCommand(T parameters) { super(parameters); setVmId(parameters.getVmId()); } @@ -37,7 +37,7 @@ returnValue = canPerformHotPlug(); } } else { - addCanDoActionMessage(VdcBllMessages.HOT_PLUG_NIC_VM_STATUS_ILLEGAL); + addCanDoActionMessage(VdcBllMessages.PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL); returnValue = false; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HotPlugUnplugVmNicParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PlugUnplugVmNicParameters.java similarity index 77% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HotPlugUnplugVmNicParameters.java rename to backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PlugUnplugVmNicParameters.java index 033f815..d88d98c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HotPlugUnplugVmNicParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PlugUnplugVmNicParameters.java @@ -2,12 +2,12 @@ import org.ovirt.engine.core.compat.Guid; -public class HotPlugUnplugVmNicParameters extends VmOperationParameterBase { +public class PlugUnplugVmNicParameters extends VmOperationParameterBase { private Guid nicId; private PlugAction action; - public HotPlugUnplugVmNicParameters(Guid nicId, PlugAction action) { + public PlugUnplugVmNicParameters(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 32ca9a4..4d12689 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), - HotPlugUnplugVmNic(42, ActionGroup.CONFIGURE_VM_NETWORK, false), + PlugUnplugVmNic(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 ae139b1..c978658 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 @@ -582,7 +582,7 @@ HOT_PLUG_DISK_IS_NOT_VIRTIO, HOT_PLUG_DISK_IS_NOT_UNPLUGGED, HOT_UNPLUG_DISK_IS_NOT_PLUGGED, - HOT_PLUG_NIC_VM_STATUS_ILLEGAL, + PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL, 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 376aef7..4f0cf44 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -693,7 +693,7 @@ 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. -HOT_PLUG_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. +PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. 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 5e95d9f..6ab8328 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.HotPlugUnplugVmNicParameters; +import org.ovirt.engine.core.common.action.PlugUnplugVmNicParameters; import org.ovirt.engine.core.common.action.PlugAction; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; @@ -106,17 +106,17 @@ @Override public Response activate(Action action) { - HotPlugUnplugVmNicParameters params = new HotPlugUnplugVmNicParameters(guid, PlugAction.PLUG); + PlugUnplugVmNicParameters params = new PlugUnplugVmNicParameters(guid, PlugAction.PLUG); BackendNicsResource parent = (BackendNicsResource) collection; params.setVmId(parent.parentId); - return doAction(VdcActionType.HotPlugUnplugVmNic, params, action); + return doAction(VdcActionType.PlugUnplugVmNic, params, action); } @Override public Response deactivate(Action action) { - HotPlugUnplugVmNicParameters params = new HotPlugUnplugVmNicParameters(guid, PlugAction.UNPLUG); + PlugUnplugVmNicParameters params = new PlugUnplugVmNicParameters(guid, PlugAction.UNPLUG); params.setVmId(((BackendNicsResource) collection).parentId); - return doAction(VdcActionType.HotPlugUnplugVmNic, params, action); + return doAction(VdcActionType.PlugUnplugVmNic, 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 291a2a0..52530d7 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,7 +1856,7 @@ 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 HOT_PLUG_NIC_VM_STATUS_ILLEGAL(); + String PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL(); @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 d1f9bbe..63e013f 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.HotPlugUnplugVmNicParameters; +import org.ovirt.engine.core.common.action.PlugUnplugVmNicParameters; 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); - HotPlugUnplugVmNicParameters params = new HotPlugUnplugVmNicParameters(nic.getId(), activate?PlugAction.PLUG:PlugAction.UNPLUG); + PlugUnplugVmNicParameters params = new PlugUnplugVmNicParameters(nic.getId(), activate?PlugAction.PLUG:PlugAction.UNPLUG); params.setVmId(vm.getId()); paramerterList.add(params); } - Frontend.RunMultipleAction(VdcActionType.HotPlugUnplugVmNic, paramerterList, + Frontend.RunMultipleAction(VdcActionType.PlugUnplugVmNic, 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 a8955b8..bbd2a03 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___HotPlugUnplugVmNic(); + String VdcActionType___PlugUnplugVmNic(); 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 26fae91..4b95b80 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___HotPlugUnplugVmNic=Activate/Deactivate Interface +VdcActionType___PlugUnplugVmNic=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 41e92b0..170290f 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,7 +687,7 @@ 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. -HOT_PLUG_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. +PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. 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 0537ffb..91d5f88 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,7 +687,7 @@ 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. -HOT_PLUG_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. +PLUG_UNPLUG_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. 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/7527 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3504be61ba4ad7bd53d1bf188ee9367310b8f9c0 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
