Frank Kobzik has uploaded a new change for review. Change subject: engine: Change DisplayType semantics ......................................................................
engine: Change DisplayType semantics This patch changes meaning of DisplayType. Now this enum determines type of VM's video device. Change-Id: I0907c9086f49f909250d9956356a0251954f1427 Bug-Url: https://bugzilla.redhat.com/1033547 Signed-off-by: Frantisek Kobzik <[email protected]> --- 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/validator/RunVmValidator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DisplayType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java 13 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/30837/1 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 ce26b6c..03cf318 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 @@ -657,7 +657,7 @@ getVm().getDefaultDisplayType() : // if Use Vnc is not null it means runVM was launch from the run once command, thus // the VM can run with display type which is different from its default display type - (getParameters().getUseVnc() ? DisplayType.vnc : DisplayType.qxl)); + (getParameters().getUseVnc() ? DisplayType.vga : DisplayType.qxl)); // todo if (getParameters().getInitializationType() == null) { // if vm not initialized, use sysprep/cloud-init diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java index 707177e..447e399 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java @@ -163,7 +163,7 @@ protected ValidationResult validateDisplayType() { DisplayType selectedDisplayType = runVmParam.getUseVnc() == null ? - vm.getDefaultDisplayType() : (runVmParam.getUseVnc() ? DisplayType.vnc : DisplayType.qxl); + vm.getDefaultDisplayType() : (runVmParam.getUseVnc() ? DisplayType.vga : DisplayType.qxl); // todo if (!VmValidationUtils.isDisplayTypeSupported(vm.getOs(), vm.getVdsGroupCompatibilityVersion(), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DisplayType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DisplayType.java index 03aa97f..6dbfb2f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DisplayType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DisplayType.java @@ -2,9 +2,9 @@ import org.ovirt.engine.core.common.utils.VmDeviceType; -// todo - note - now this is display type. because of os info, we don't change this now but in follow up public enum DisplayType { - vnc(VmDeviceType.VGA), + vga(VmDeviceType.VGA), + cirrus(VmDeviceType.CIRRUS), qxl(VmDeviceType.QXL); private VmDeviceType defaultVmDeviceType; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java index adc9b45..8a68708 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java @@ -239,7 +239,7 @@ public VmDynamic() { id = Guid.Empty; status = VMStatus.Down; - displayType = DisplayType.vnc; + displayType = DisplayType.vga; pauseStatus = VmPauseStatus.NONE; exitStatus = VmExitStatus.Normal; win2kHackEnabled = false; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResourceTest.java index e88770d..9d9e1c2 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResourceTest.java @@ -62,7 +62,7 @@ expect(entity.getDescription()).andReturn(DESCRIPTIONS[1]).anyTimes(); expect(entity.getNumOfCpus()).andReturn(8).anyTimes(); expect(entity.getNumOfSockets()).andReturn(2).anyTimes(); - expect(entity.getDefaultDisplayType()).andReturn(DisplayType.vnc).anyTimes(); + expect(entity.getDefaultDisplayType()).andReturn(DisplayType.vga).anyTimes(); expect(entity.getNumOfMonitors()).andReturn(2).anyTimes(); expect(entity.getVmType()).andReturn(VmType.Server).anyTimes(); return entity; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java index cc1f692..034e509 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java @@ -1335,7 +1335,7 @@ expect(entity.getNumOfCpus()).andReturn(8).anyTimes(); expect(entity.getNumOfSockets()).andReturn(2).anyTimes(); expect(entity.getUsageMemPercent()).andReturn(Integer.valueOf(20)).anyTimes(); - expect(entity.getDisplayType()).andReturn(DisplayType.vnc).anyTimes(); + expect(entity.getDisplayType()).andReturn(DisplayType.vga).anyTimes(); expect(entity.getDisplaySecurePort()).andReturn(5900).anyTimes(); expect(entity.getNumOfMonitors()).andReturn(2).anyTimes(); expect(entity.getVmType()).andReturn(VmType.Server).anyTimes(); @@ -1358,7 +1358,7 @@ expect(entity.getDescription()).andReturn(DESCRIPTIONS[index]).anyTimes(); expect(entity.getNumOfCpus()).andReturn(8).anyTimes(); expect(entity.getNumOfSockets()).andReturn(2).anyTimes(); - expect(entity.getDefaultDisplayType()).andReturn(DisplayType.vnc).anyTimes(); + expect(entity.getDefaultDisplayType()).andReturn(DisplayType.vga).anyTimes(); expect(entity.getNumOfMonitors()).andReturn(2).anyTimes(); expect(entity.getVmType()).andReturn(VmType.Server).anyTimes(); return entity; diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java index 144ac45..141664b 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java @@ -733,7 +733,7 @@ public static org.ovirt.engine.core.common.businessentities.DisplayType map(DisplayType type, org.ovirt.engine.core.common.businessentities.DisplayType incoming) { switch(type) { case VNC: - return org.ovirt.engine.core.common.businessentities.DisplayType.vnc; + return org.ovirt.engine.core.common.businessentities.DisplayType.vga; case SPICE: return org.ovirt.engine.core.common.businessentities.DisplayType.qxl; default: @@ -744,7 +744,7 @@ @Mapping(from = org.ovirt.engine.core.common.businessentities.DisplayType.class, to = String.class) public static String map(org.ovirt.engine.core.common.businessentities.DisplayType type, String incoming) { switch(type) { - case vnc: + case vga: return DisplayType.VNC.value(); case qxl: return DisplayType.SPICE.value(); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java index d4257f9..4c15a80 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java @@ -717,7 +717,7 @@ if (virtualQuantity > 1) { vmDevice.setDevice(VmDeviceType.QXL.getName()); } else { - VmDeviceType vmDeviceType = getDisplayDevice(DisplayType.vnc); + VmDeviceType vmDeviceType = getDisplayDevice(DisplayType.vga); vmDevice.setDevice(vmDeviceType.getName()); } } else { // default to spice if quantity not found diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java index 8d16db7..4cc579d 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java @@ -45,7 +45,7 @@ preferences.node("/os/rhel7/resources/minimum/ram").put("value", "1024"); preferences.node("/os/rhel7/resources/minimum/ram").put("value.3.1", "512"); preferences.node("/os/rhel7/resources/maximum/ram").put("value", "2048"); - preferences.node("/os/rhel7/devices/display/protocols").put("value", "vnc/cirrus,qxl/qxl"); + preferences.node("/os/rhel7/devices/display/protocols").put("value", "vga/cirrus,qxl/qxl"); // will be adjusted in next patch preferences.node("/os/rhel7/devices/balloon/enabled").put("value", "true"); preferences.node("/os/rhel7/sysprepPath").put("value", PATH_TO_SYSPREP); preferences.node("/os/rhel7/productKey").put("value", SOME_PRODUCT_KEY); @@ -162,7 +162,7 @@ List<DisplayType> supportedDisplays = OsRepositoryImpl.INSTANCE.getDisplayTypes().get(777).get(null); boolean isSizeCorrect = supportedDisplays.size() == 2; - boolean containsSameElements = (new HashSet<DisplayType>(supportedDisplays)).equals(new HashSet<DisplayType>(Arrays.asList(DisplayType.qxl, DisplayType.vnc))); + boolean containsSameElements = (new HashSet<DisplayType>(supportedDisplays)).equals(new HashSet<DisplayType>(Arrays.asList(DisplayType.qxl, DisplayType.vga))); assertTrue(isSizeCorrect); assertTrue(containsSameElements); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java index 43226b8..59d8862 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java @@ -142,7 +142,7 @@ createInfo.put(VdsProperties.PitReinjection, "false"); } - if (vm.getDisplayType() == DisplayType.vnc) { + if (vm.getDisplayType() == DisplayType.vga) { createInfo.put(VdsProperties.TabletEnable, "true"); } createInfo.put(VdsProperties.transparent_huge_pages, diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java index 989b026..e3d4daf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java @@ -694,7 +694,7 @@ setIsBootFromHardDiskAllowedForVm(); // Display protocols. - EntityModel<DisplayType> vncProtocol = new EntityModel<DisplayType>(DisplayType.vnc) + EntityModel<DisplayType> vncProtocol = new EntityModel<DisplayType>(DisplayType.vga) .setTitle(ConstantsManager.getInstance().getConstants().VNCTitle()); EntityModel<DisplayType> qxlProtocol = new EntityModel<DisplayType>(DisplayType.qxl) @@ -709,7 +709,7 @@ getDisplayConsole_Spice_IsSelected().setIsAvailable(false); } - getDisplayProtocol().setSelectedItem(vm.getDefaultDisplayType() == DisplayType.vnc ? + getDisplayProtocol().setSelectedItem(vm.getDefaultDisplayType() == DisplayType.vga ? vncProtocol : qxlProtocol); getSpiceFileTransferEnabled().setEntity(vm.isSpiceFileTransferEnabled()); getSpiceCopyPasteEnabled().setEntity(vm.isSpiceCopyPasteEnabled()); @@ -774,7 +774,7 @@ } EntityModel<? extends DisplayType> displayProtocolSelectedItem = getDisplayProtocol().getSelectedItem(); - params.setUseVnc(displayProtocolSelectedItem.getEntity() == DisplayType.vnc); + params.setUseVnc(displayProtocolSelectedItem.getEntity() == DisplayType.vga); if (getDisplayConsole_Vnc_IsSelected().getEntity() || getDisplayConsole_Spice_IsSelected().getEntity()) { @@ -893,7 +893,7 @@ } private void updateDisplayProtocols() { - boolean isVncSelected = vm.getDefaultDisplayType() == DisplayType.vnc; + boolean isVncSelected = vm.getDefaultDisplayType() == DisplayType.vga; getDisplayConsole_Vnc_IsSelected().setEntity(isVncSelected); getDisplayConsole_Spice_IsSelected().setEntity(!isVncSelected); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index 978e7c6..eee6813 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -2021,12 +2021,12 @@ } List<EntityModel<DisplayType>> displayProtocolOptions = new ArrayList<EntityModel<DisplayType>>(); - if (displayTypes.contains(DisplayType.vnc)) { + if (displayTypes.contains(DisplayType.vga)) { EntityModel<DisplayType> vncProtocol = new EntityModel<DisplayType>(); vncProtocol.setTitle(ConstantsManager.getInstance().getConstants().VNCTitle()); - vncProtocol.setEntity(DisplayType.vnc); + vncProtocol.setEntity(DisplayType.vga); displayProtocolOptions.add(vncProtocol); - if (DisplayType.vnc == oldDisplayProtocolOption) { + if (DisplayType.vga == oldDisplayProtocolOption) { oldDisplayProtocolEntity = vncProtocol; } } @@ -2317,7 +2317,7 @@ } DisplayType type = getDisplayType(); - if (type == DisplayType.vnc) + if (type == DisplayType.vga) { getUsbPolicy().setSelectedItem(org.ovirt.engine.core.common.businessentities.UsbPolicy.DISABLED); getIsSmartcardEnabled().setEntity(false); @@ -2328,7 +2328,7 @@ getUsbPolicy().setIsChangable(type == DisplayType.qxl); getIsSmartcardEnabled().setIsChangable(type == DisplayType.qxl); - getVncKeyboardLayout().setIsAvailable(type == DisplayType.vnc); + getVncKeyboardLayout().setIsAvailable(type == DisplayType.vga); updateNumOfMonitors(); } @@ -2367,7 +2367,7 @@ if (getDisplayProtocol().getSelectedItem() != null) { DisplayType displayType = getDisplayProtocol().getSelectedItem().getEntity(); - isVnc = displayType == DisplayType.vnc; + isVnc = displayType == DisplayType.vga; } return isVnc; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java index e91684f..8ec821f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java @@ -113,7 +113,7 @@ ? getEntity().getDisplayType() : getEntity().getDefaultDisplayType(); - return vmDisplayType == DisplayType.vnc; + return vmDisplayType == DisplayType.vga; } private void setVmTicket() { -- To view, visit http://gerrit.ovirt.org/30837 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0907c9086f49f909250d9956356a0251954f1427 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
