August 2012 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: webadmin: Updated SPICE cab download fix (#846341)
by ecohen＠redhat.com 09 Aug '12

09 Aug '12

Einav Cohen has submitted this change and it was merged. Change subject: webadmin: Updated SPICE cab download fix (#846341) ...................................................................... webadmin: Updated SPICE cab download fix (#846341) https://bugzilla.redhat.com/846341 Before this patch, this was the situation: class Configurator { protected abstract Event getSpiceVersionFileFetchedEvent(); // Configurator c'tor public Configurator() { ... ... updateSpiceVersion(); } private void updateSpiceVersion() { doSomething(getSpiceVersionFileFetchedEvent()); } } --- class WebAdminConfigurator extends Configurator { public Event spiceVersionFileFetchedEvent = [initialized]; // WebAdminConfigurator c'tor public WebAdminConfigurator(EventBus eventBus) { super(); ... ... } @Override protected Event getSpiceVersionFileFetchedEvent() { return spiceVersionFileFetchedEvent; } } In the WebAdminConfigurator c'tor, there is a call to "super()", i.e., Configurator c'tor, that calls to updateSpiceVersion(), which calls to getSpiceVersionFileFetchedEvent(). getSpiceVersionFileFetchedEvent() is an abstract method in Configurator. Its "implementation" (override) in WebAdminConfigurator returns the spiceVersionFileFetchedEvent member which, theoretically, should be initialized with the "[initialized]" value. However, practically, since the above is happenning during the base class (Configurator) c'tor execution, the WebAdminConfigurator members' initialization hasn't occurred yet, therefore, "spiceVersionFileFetchedEvent" is actually null, and not initialized to "[initialized]" yet. This prevents the "post-fetch-spice-version-file" event from being treated by the relevant event handler, hence the actual server-side SPICE ActiveX cab version is not updated appropriately within the configurator; so the server-side spice-version value practically supplied by the Configurator is the default hard-coded value with which the spiceVersion Configurator member was initialized, i.e. "4.4". So in case the client has a spice ActiveX with a version greater than 4.4, it won't download the SPICE ActiveX cab from the server, since the client thinks that the version of the server-side cab is 4.4, i.e., less than what is currently installed, so no reason to download and upgrade the ActiveX. If the actual version of the server-side cab is greater than 4.4, it can cause a buggy behavior in case client is installed with a version smaller than the actual server-side version: Updated server-side cab should be downloaded to the client since its actual version is larger than the one installed on the client, but due to this bug - it won't happen. E.g.: - reported (buggy) server-side SPICE version: 4.4 - actual server-side SPICE version: 5.0 - SPICE version installed on the client: 4.8. - client asks server for the server-side-SPICE version. - server returns: 4.4 - client compares currently-installed version (4.8) against server-side version (4.4) -> 4.4 is smaller than 4.8 -> client concludes that there is no need to download server-side cab. This is incorrect behavior - actual server-side SPICE version is 5.0, and *should* be downloaded to the client in this case. In this patch, the call to updateSpiceVersion() is done in the WebAdminConfigurator (and UserPortalConfigurator) c'tor, instead of the Configurator c'tor, in a stage in which the spiceVersionFileFetchedEvent member is already initialized; Therefore, once the SPICE version txt file is fetched and read, the version is updated correctly within the configurator, server reports correct version of server-side cab, hence client downloads updated server-side cab when it should. Change-Id: I100e722ed85554451d51e9ddb73f3bb35522684f Signed-off-by: Einav Cohen <ecohen(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java 3 files changed, 7 insertions(+), 4 deletions(-) Approvals: Einav Cohen: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7065 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I100e722ed85554451d51e9ddb73f3bb35522684f Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Einav Cohen <ecohen(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com>

1 0

Change in ovirt-engine[master]: webadmin: text fix engine->Engine (#845430)
by derez＠redhat.com 09 Aug '12

09 Aug '12

Daniel Erez has submitted this change and it was merged. Change subject: webadmin: text fix engine->Engine (#845430) ...................................................................... webadmin: text fix engine->Engine (#845430) https://bugzilla.redhat.com/845430 "Verify connectivity between Host and engine" -> "Verify connectivity between Host and Engine" Change-Id: I89c8bacd8bb0742b2765b752c197adfdbf9edae8 Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Alona Kaplan: Verified Daniel Erez: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7067 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89c8bacd8bb0742b2765b752c197adfdbf9edae8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>

1 0

Change in ovirt-engine[master]: webadmin: bug fix in unmanaged networks (#820504)
by derez＠redhat.com 09 Aug '12

09 Aug '12

Daniel Erez has submitted this change and it was merged. Change subject: webadmin: bug fix in unmanaged networks (#820504) ...................................................................... webadmin: bug fix in unmanaged networks (#820504) https://bugzilla.redhat.com/820504 If a network is vlan-ed the implementation details are on the nic.vlanId and not nic. In isManaged and isInSync it read the details from the nic and not nic.vlan_id Change-Id: Ie42e349be4873e44a5c6ee71671d6c630e58342c Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java 2 files changed, 15 insertions(+), 3 deletions(-) Approvals: Alona Kaplan: Verified Daniel Erez: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7064 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie42e349be4873e44a5c6ee71671d6c630e58342c Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: SyntaxChecker cleanup II
by lhornyak＠redhat.com 09 Aug '12

09 Aug '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: SyntaxChecker cleanup II ...................................................................... core: SyntaxChecker cleanup II - java.util import instead of fqn - more variable.equals("CONSTANT") to "CONSTANT".equals(variable) Change-Id: I0f95ffd0f437bf0eb5f189990a01a97d58974d99 Signed-off-by: Laszlo Hornyak <lhornyak(a)redhat.com> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java 1 file changed, 15 insertions(+), 13 deletions(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7036 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f95ffd0f437bf0eb5f189990a01a97d58974d99 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: SyntaxChecker cleanup I
by lhornyak＠redhat.com 09 Aug '12

09 Aug '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: SyntaxChecker cleanup I ...................................................................... core: SyntaxChecker cleanup I - final parameters in overcomplicated functions where possible, so that they can be tracked easily - variable.equals("CONSTANT") and StringHelper.EqOp(variable, "CONSTANT") replaced by "CONSTANT".equals(variable) - some decision factored out to new methods Change-Id: I8da7918b8c048af46313d99663e44142118eee49 Signed-off-by: Laszlo Hornyak <lhornyak(a)redhat.com> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java 1 file changed, 30 insertions(+), 17 deletions(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7035 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8da7918b8c048af46313d99663e44142118eee49 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com>

1 0

Change in ovirt-engine[master]: webadmin: port mirroring should be enabled just for 3.1 and ...
by gchaplik＠redhat.com 09 Aug '12

09 Aug '12

Gilad Chaplik has submitted this change and it was merged. Change subject: webadmin: port mirroring should be enabled just for 3.1 and upper (#846025) ...................................................................... webadmin: port mirroring should be enabled just for 3.1 and upper (#846025) https://bugzilla.redhat.com/846025 Port mirroring should bne enabed in vnic dialogs with cluster 3.1 and upper otherwise- disabled. Change-Id: Ie77035a3197ea284d68de35825f738e182274264 Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java 2 files changed, 9 insertions(+), 1 deletion(-) Approvals: Alona Kaplan: Verified Gilad Chaplik: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7057 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie77035a3197ea284d68de35825f738e182274264 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>

1 0

Change in ovirt-engine[master]: webadmin: remove the word ovirt from SetupNetworks dialog (#...
by masayag＠redhat.com 09 Aug '12

09 Aug '12

Moti Asayag has submitted this change and it was merged. Change subject: webadmin: remove the word ovirt from SetupNetworks dialog (#845430) ...................................................................... webadmin: remove the word ovirt from SetupNetworks dialog (#845430) https://bugzilla.redhat.com/845430 Change "Verify connectivity between Host and ovirt-engine" to "Verify connectivity between Host and engine" Change-Id: I92deb3fd40d88be5bfacc92f72ebd63f1c64e686 Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Moti Asayag: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7055 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92deb3fd40d88be5bfacc92f72ebd63f1c64e686 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>

1 0

Change in ovirt-engine[master]: webadmin: fix wrong text (#835533)
by masayag＠redhat.com 09 Aug '12

09 Aug '12

Moti Asayag has submitted this change and it was merged. Change subject: webadmin: fix wrong text (#835533) ...................................................................... webadmin: fix wrong text (#835533) https://bugzilla.redhat.com/show_bug.cgi?id=835533 UnAssign->Unassign UnManaged->Unmanaged Change-Id: I5a4ee8855dceaaac5fb5b43f0d8dfae0794fb250 Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com> --- M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Moti Asayag: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7056 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a4ee8855dceaaac5fb5b43f0d8dfae0794fb250 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>

1 0

Change in ovirt-engine[master]: webadmin: localization of SetupNetworks (#840842)
by masayag＠redhat.com 09 Aug '12

09 Aug '12

Moti Asayag has submitted this change and it was merged. Change subject: webadmin: localization of SetupNetworks (#840842) ...................................................................... webadmin: localization of SetupNetworks (#840842) https://bugzilla.redhat.com/840842 Change-Id: Iac30cc55d2b16d5abb88da9b3aa62df05da91008 Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java 6 files changed, 49 insertions(+), 14 deletions(-) Approvals: Moti Asayag: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7054 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac30cc55d2b16d5abb88da9b3aa62df05da91008 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com> Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>

1 0

Change in ovirt-engine[master]: engine: Improve tests to expect violating entity (#844158)
by mkolesni＠redhat.com 09 Aug '12

09 Aug '12

Mike Kolesnik has submitted this change and it was merged. Change subject: engine: Improve tests to expect violating entity (#844158) ...................................................................... engine: Improve tests to expect violating entity (#844158) https://bugzilla.redhat.com/844158 The SetupNetworksHelperTest that expects a violation will now expect also that the key for the violating entity will be filled with correct value. Change-Id: I8b21418b7ef8f1ede06155ffd8cedb15e2336b5b Signed-off-by: Mike Kolesnik <mkolesni(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetupNetworksHelper.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksHelperTest.java 2 files changed, 41 insertions(+), 12 deletions(-) Approvals: Mike Kolesnik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/6950 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b21418b7ef8f1ede06155ffd8cedb15e2336b5b Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <mkolesni(a)redhat.com> Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>

1 0