Tomas Jelinek has uploaded a new change for review. Change subject: core,frontend: allow console reconnect incorrectly handled ......................................................................
core,frontend: allow console reconnect incorrectly handled Problems: - it was not dependent on the VM Type - by default it was not checked but since the default VM Type is server it should have been - it was completly ignored on the pool (both on FE and on BE) This patch fixes all of this issues. Change-Id: I16c364133ce5da37517007960ba6fb4af79a6aea Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1005689 Signed-off-by: Tomas Jelinek <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.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/VmModelBehaviorBase.java 6 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/19454/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java index da8e1f5..0151c02 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java @@ -99,6 +99,7 @@ setDefaultDisplayType(vmStatic.getDefaultDisplayType()); setDedicatedVmForVds(vmStatic.getDedicatedVmForVds()); setMigrationSupport(vmStatic.getMigrationSupport()); + setAllowConsoleReconnect(vmStatic.isAllowConsoleReconnect()); } public String getCustomProperties() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java index 5ef0cdf..141076f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java @@ -507,6 +507,7 @@ vm.setDefaultDisplayType((DisplayType) displayProtocolSelectedItem.getEntity()); vm.setCustomProperties(model.getCustomPropertySheet().getEntity()); vm.setVmType((VmType) model.getVmType().getSelectedItem()); + vm.setAllowConsoleReconnect((Boolean) model.getAllowConsoleReconnect().getEntity()); AddVmPoolWithVmsParameters param = new AddVmPoolWithVmsParameters(pool, vm, model.getNumOfDesktops() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java index a0ef98e..f3f675e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java @@ -97,7 +97,6 @@ getModel().getIsDeleteProtected().setEntity(template.isDeleteProtected()); getModel().getIsStateless().setEntity(template.isStateless()); - getModel().getAllowConsoleReconnect().setEntity(template.isAllowConsoleReconnect()); boolean hasCd = !StringHelper.isNullOrEmpty(template.getIsoPath()); @@ -149,6 +148,7 @@ getModel().getVmType().setSelectedItem(template.getVmType()); getModel().setIsBlankTemplate(false); getModel().getCopyPermissions().setIsAvailable(true); + getModel().getAllowConsoleReconnect().setEntity(template.isAllowConsoleReconnect()); initDisks(); initSoundCard(template.getId()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java index 3a6d3c8..9f998a8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java @@ -169,6 +169,8 @@ } initSoundCard(vmBase.getId()); + + getModel().getAllowConsoleReconnect().setEntity(vmBase.isAllowConsoleReconnect()); } } 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 5bd0398..5316867 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 @@ -1522,9 +1522,8 @@ } - protected void initAllowConsoleReconnect() - { - getAllowConsoleReconnect().setEntity(true); + protected void initAllowConsoleReconnect() { + getAllowConsoleReconnect().setEntity(getVmType().getSelectedItem() == VmType.Server); } private void initOSType() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index 4b24b57..a20f79d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -976,6 +976,7 @@ public void vmTypeChanged(VmType vmType) { getModel().getIsSoundcardEnabled().setEntity(vmType == VmType.Desktop); + getModel().getAllowConsoleReconnect().setEntity(vmType == VmType.Server); } protected void initSoundCard(Guid id) { -- To view, visit http://gerrit.ovirt.org/19454 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16c364133ce5da37517007960ba6fb4af79a6aea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
