Tomas Jelinek has posted comments on this change. Change subject: frontend: RNG device sources reporting ......................................................................
Patch Set 7: (7 comments) http://gerrit.ovirt.org/#/c/22259/7/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java: Line 225: { Line 226: privateCPU = value; Line 227: } Line 228: Line 229: EntityModel<Boolean> rngRandomSourceRequired; private Line 230: Line 231: public EntityModel<Boolean> getRngRandomSourceRequired() { Line 232: return rngRandomSourceRequired; Line 233: } Line 235: public void setRngRandomSourceRequired(EntityModel<Boolean> rngRandomSourceRequired) { Line 236: this.rngRandomSourceRequired = rngRandomSourceRequired; Line 237: } Line 238: Line 239: EntityModel<Boolean> rngHwrngSourceRequired; private Line 240: Line 241: public EntityModel<Boolean> getRngHwrngSourceRequired() { Line 242: return rngHwrngSourceRequired; Line 243: } Line 1389: Line 1390: private void setRngSourcesCheckboxes(Version ver) { Line 1391: boolean rngSupported = isRngSupportedForClusterVersion(ver); Line 1392: getRngRandomSourceRequired().setIsAvailable(rngSupported); Line 1393: getRngHwrngSourceRequired().setIsAvailable(rngSupported); please don't hide the checkboxes, only disable them with an explanation in the title. Line 1394: Line 1395: String defaultRequiredRngSourcesCsv = defaultClusterRngSourcesCsv(ver); Line 1396: Line 1397: if (rngSupported) { Line 1630: private void validateRngRequiredSource() { Line 1631: Version cluVersion = (Version) getVersion().getSelectedItem(); Line 1632: boolean rngSupportedForCluster = isRngSupportedForClusterVersion(cluVersion); Line 1633: Line 1634: getRngRandomSourceRequired().setIsValid(rngSupportedForCluster); this is not valid only if the cluster version does not support it and it is selected. So, something like this: getRngRandomSourceRequired().setIsValid(rngSupportedForCluster || !getRngRandomSourceRequired().getEntity()); Line 1635: getRngHwrngSourceRequired().setIsValid(rngSupportedForCluster); Line 1636: } Line 1637: Line 1638: private boolean isRngSupportedForClusterVersion(Version ver) { Line 1631: Version cluVersion = (Version) getVersion().getSelectedItem(); Line 1632: boolean rngSupportedForCluster = isRngSupportedForClusterVersion(cluVersion); Line 1633: Line 1634: getRngRandomSourceRequired().setIsValid(rngSupportedForCluster); Line 1635: getRngHwrngSourceRequired().setIsValid(rngSupportedForCluster); same Line 1636: } Line 1637: Line 1638: private boolean isRngSupportedForClusterVersion(Version ver) { Line 1639: if (ver == null) { http://gerrit.ovirt.org/#/c/22259/7/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java: Line 2162: } Line 2163: Line 2164: private void setRngDeviceToParams(UnitVmModel model, VmManagementParametersBase parameters) { Line 2165: parameters.setUpdateRngDevice(true); Line 2166: boolean rngEnabledAndValid = (Boolean) model.getIsRngEnabled().getEntity() && !model.getSelectedCluster().getRequiredRngSources().isEmpty(); you need this logic also in UserPortalListModel, PoolListModel and TemplateListModel Line 2167: parameters.setRngDevice(rngEnabledAndValid Line 2168: ? model.generateRngDevice() Line 2169: : null); Line 2170: } http://gerrit.ovirt.org/#/c/22259/7/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java File frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java: Line 601: architectureEditor.setVisible(isCpuNameBlank); Line 602: } Line 603: }); Line 604: Line 605: object.getVersion().getEntityChangedEvent().addListener(new IEventListener() { if you will not hide the checkboxes this code will not be needed. Line 606: @Override Line 607: public void eventRaised(Event ev, Object sender, EventArgs args) { Line 608: rngLabel.setVisible(object.getRngRandomSourceRequired().getIsAvailable() Line 609: && object.getRngHwrngSourceRequired().getIsAvailable()); -- To view, visit http://gerrit.ovirt.org/22259 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifd065835d18575b686ee805b032662205b31c966 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkob...@redhat.com> Gerrit-Reviewer: Arik Hadas <aha...@redhat.com> Gerrit-Reviewer: Frank Kobzik <fkob...@redhat.com> Gerrit-Reviewer: Itamar Heim <ih...@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofren...@redhat.com> Gerrit-Reviewer: Roy Golan <rgo...@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjeli...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches