May 2016 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: engine: change VmInfoBuilder network filter logic
by alkaplan＠redhat.com 05 May '16

05 May '16

Alona Kaplan has submitted this change and it was merged. Change subject: engine: change VmInfoBuilder network filter logic ...................................................................... engine: change VmInfoBuilder network filter logic The feature of Network filter enhancing the user ability to customize the vNIC's network filter type beside 'vdsm-no-mac-spoofing' or configurating no filter at all. Please note that vdsm will configure the mentioned 'filter' property's value as the vNIC's network filter. In case no network filter is desirable, the filter property should not be mentioned at all. The patch is modifing the engine's logic which used to un\mention the 'filter' property according to the value of 'EnableMACAntiSpoofingFilterRules' saved in vdc_options table. The option_name of 'EnableMACAntiSpoofingFilterRules' and the corresponding backend's representation is kept for backward compatibility support, specifically for Rest API scripting for determining the default network filter behavior. Please note that the use of NetworkFilterDao was without DI as it required a major refactoring of VmInfoBuilder and it should be done in a dedicated patch. Change-Id: Ie0cb0604e708adbc09dc4742c47464131357fe32 Signed-off-by: Eliraz Levi <elevi(a)redhat.com> Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NetworkFilters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java 4 files changed, 30 insertions(+), 25 deletions(-) Approvals: Alona Kaplan: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/52768 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0cb0604e708adbc09dc4742c47464131357fe32 Gerrit-PatchSet: 10 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eliraz Levi <elevi(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: engine: Support for replace brick
by sabose＠redhat.com 05 May '16

05 May '16

Sahina Bose has submitted this change and it was merged. Change subject: engine: Support for replace brick ...................................................................... engine: Support for replace brick Allow replacing a brick for a gluster volume. The replacement of a brick does not migrate data, so should be performed only for replica volumes to prevent data loss Change-Id: I3aef6777653db94ff1b4c32c85a609fe7849edd9 Bug-Url: https://bugzilla.redhat.com/1213309 Signed-off-by: Sahina Bose <sabose(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeReplaceBrickActionParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineError.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ReplaceGlusterVolumeBrickActionVDSParameters.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ReplaceGlusterVolumeBrickVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.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/gluster/ReplaceBrickModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.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/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/ReplaceBrickPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/ReplaceBrickPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M packaging/dbscripts/gluster_volumes_sp.sql 26 files changed, 215 insertions(+), 98 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Sahina Bose: Verified; Looks good to me, approved Ramesh N: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/43260 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3aef6777653db94ff1b4c32c85a609fe7849edd9 Gerrit-PatchSet: 18 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Kanagaraj M <kanagaraj.ktr(a)gmail.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Ramesh N <rnachimu(a)redhat.com> Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: engine: Allow IPv6 in NFS mount points
by alkaplan＠redhat.com 05 May '16

05 May '16

Alona Kaplan has submitted this change and it was merged. Change subject: engine: Allow IPv6 in NFS mount points ...................................................................... engine: Allow IPv6 in NFS mount points Allow IPv6 in NFS mount points. An IPv6 literal address should be wrapped with brackets '[]'. Change-Id: Id8fc2fbcfd596b7c8bcfd0848a68363765f85fd3 Bug-Url: https://bugzilla.redhat.com/1302358 Signed-off-by: Yevgeny Zaspitsky <yzaspits(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NfsMountPointConstraint.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java 2 files changed, 14 insertions(+), 7 deletions(-) Approvals: Alona Kaplan: Looks good to me, but someone else must approve; Passed CI tests Daniel Erez: Looks good to me, approved Yevgeny Zaspitsky: Verified -- To view, visit https://gerrit.ovirt.org/56539 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8fc2fbcfd596b7c8bcfd0848a68363765f85fd3 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: webadmin: Refactor validations to cope with IPv6 addresses
by alkaplan＠redhat.com 05 May '16

05 May '16

Alona Kaplan has submitted this change and it was merged. Change subject: webadmin: Refactor validations to cope with IPv6 addresses ...................................................................... webadmin: Refactor validations to cope with IPv6 addresses Change-Id: Ief1b2bb1667b847b1e4cb0a74914f4a1c16854bb Bug-Url: https://bugzilla.redhat.com/1302358 Signed-off-by: Yevgeny Zaspitsky <yzaspits(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ValidationUtils.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/UriAuthority.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/BaseI18NValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/BrickMountPointValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/HostAddressValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/I18NNameValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/Ipv4AddressValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/Ipv6AddressValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/LinuxMountPointValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/LocalfsLinuxMountPointValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/RegexValidation.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/UriHostAddressValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/UrlValidation.java A frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/UriAuthorityTest.java M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidationTest.java M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/LinuxMountPointValidationTest.java A frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/UriHostAddressValidationTest.java M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/UrlValidationTest.java 20 files changed, 226 insertions(+), 91 deletions(-) Approvals: Alona Kaplan: Looks good to me, but someone else must approve; Passed CI tests Daniel Erez: Looks good to me, approved Yevgeny Zaspitsky: Verified -- To view, visit https://gerrit.ovirt.org/56538 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief1b2bb1667b847b1e4cb0a74914f4a1c16854bb Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: engine: add network_filter_id column to vnic_profiles
by alkaplan＠redhat.com 05 May '16

05 May '16

Alona Kaplan has submitted this change and it was merged. Change subject: engine: add network_filter_id column to vnic_profiles ...................................................................... engine: add network_filter_id column to vnic_profiles The column will be used to configure each vNIC's network filter. If 'Vdc_Options.EnableMACAntiSpoofingFilterRules' is 'true', 'vdsm-no-mac-spoofing' filter will be set on all the vNic profiles, otherwise NULL will be set. In case the vNIC profile points to NULL, no network filter will be configured for that specific vNIC. It is important to mention, that libvirt's backward compatibility version support is assumed, meaning that libvirt will keep supporting all the filters introduced in older versions. Otherwise the output for the following scenario is undefined: network N defined in data center with compatibility version V1 is being assigned to cluster with compatibility version V2 where V2 > V1, as the network filter of version V1 may not be supported in hosts of version V2. The reason for allowing this tightly coupling in libvirt is product commonality, as other features depending on libvirt assuming backward compatibility. Change-Id: I1a7cce4b9b377a4eaf309ad63e87832489b25a16 Signed-off-by: Eliraz Levi <elevi(a)redhat.com> Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VnicProfile.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VnicProfileDaoImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkFilterDaoTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VnicProfileDaoTest.java M backend/manager/modules/dal/src/test/resources/fixtures.xml M packaging/dbscripts/create_views.sql M packaging/dbscripts/network_sp.sql A packaging/dbscripts/upgrade/04_00_0600_add_network_filter_id_to_vnic_profile.sql 9 files changed, 83 insertions(+), 14 deletions(-) Approvals: Eli Mesika: Looks good to me, but someone else must approve Alona Kaplan: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/51664 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a7cce4b9b377a4eaf309ad63e87832489b25a16 Gerrit-PatchSet: 21 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eliraz Levi <elevi(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Eliraz Levi <elevi(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com> Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: webadmin: Fix of disablityHint
by tjelinek＠redhat.com 05 May '16

05 May '16

Tomas Jelinek has submitted this change and it was merged. Change subject: webadmin: Fix of disablityHint ...................................................................... webadmin: Fix of disablityHint Components based on AbstractValidatedWidgetWithLabel can be disabled (greyed out) with optional tooltip. This tooltip was not removed when re-enabled. This patch ensures tooltip to be removed when `setEnabled(true)` is called. Change-Id: I628c06427f1f7fd1632a018e01224bb2c19e726f Signed-off-by: Jakub Niedermertl <jniederm(a)redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Tomas Jelinek: Looks good to me, approved Jakub Niedermertl: Verified Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/57050 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I628c06427f1f7fd1632a018e01224bb2c19e726f Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Jakub Niedermertl <jniederm(a)redhat.com> Gerrit-Reviewer: Jakub Niedermertl <jniederm(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: Cluster and ServerCpu toString()
by tjelinek＠redhat.com 05 May '16

05 May '16

Tomas Jelinek has submitted this change and it was merged. Change subject: core: Cluster and ServerCpu toString() ...................................................................... core: Cluster and ServerCpu toString() toString() methods added to improve debug experience. Change-Id: Ie5fcf4efa0622bcc3c268498407e9f3f450db2aa Signed-off-by: Jakub Niedermertl <jniederm(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Cluster.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ServerCpu.java 2 files changed, 8 insertions(+), 0 deletions(-) Approvals: Jakub Niedermertl: Verified Jenkins CI: Passed CI tests Arik Hadas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/57049 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5fcf4efa0622bcc3c268498407e9f3f450db2aa Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Jakub Niedermertl <jniederm(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jakub Niedermertl <jniederm(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: aaa: add new kerberos configuration to jaas
by tnisan＠redhat.com 05 May '16

05 May '16

Tal Nisan has submitted this change and it was merged. Change subject: aaa: add new kerberos configuration to jaas ...................................................................... aaa: add new kerberos configuration to jaas Adds new <security-domain> configuration to JBoss configuration file which allows use of ticket cache and/or keytab to login. Change-Id: Ic36734c65793674fa0b37a7baf0f59b7fc27287b Bug-Url: https://bugzilla.redhat.com/1327041 Signed-off-by: Ondra Machacek <omachace(a)redhat.com> (cherry picked from commit 656e11ec1c83718f4425be424d98c2402b066260) --- M packaging/services/ovirt-engine/ovirt-engine.conf.in M packaging/services/ovirt-engine/ovirt-engine.py M packaging/services/ovirt-engine/ovirt-engine.xml.in 3 files changed, 53 insertions(+), 1 deletion(-) Approvals: Ondra Machacek: Verified Martin Peřina: Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/56120 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic36734c65793674fa0b37a7baf0f59b7fc27287b Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Ondra Machacek <omachace(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Ondra Machacek <omachace(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: aaa: exttool: use JBoss JAAS configuration by default
by tnisan＠redhat.com 05 May '16

05 May '16

Tal Nisan has submitted this change and it was merged. Change subject: aaa: exttool: use JBoss JAAS configuration by default ...................................................................... aaa: exttool: use JBoss JAAS configuration by default To be consistent with behaviour of aaa-ldap running in JBoss and extension-tool running outside of JBoss, we provide temporary configuration of JAAS to exttool, which reflect configuration of <security-domains> in JBoss. Change-Id: Idf816a065cc4e4b0a3dc5b378bacd4c2aa214dfb Bug-Url: https://bugzilla.redhat.com/1327041 Signed-off-by: Ondra Machacek <omachace(a)redhat.com> (cherry picked from commit ab4a52b18ee3b75bfafaec6dc1f87f4182e9ec5b) --- M backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ExtensionsToolExecutor.java M packaging/bin/ovirt-engine-extensions-tool.sh 2 files changed, 76 insertions(+), 0 deletions(-) Approvals: Ondra Machacek: Verified Martin Peřina: Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/56121 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf816a065cc4e4b0a3dc5b378bacd4c2aa214dfb Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Ondra Machacek <omachace(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Ondra Machacek <omachace(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6.6]: core: Fix Storage allocation validation for live merge
by tnisan＠redhat.com 05 May '16

05 May '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Fix Storage allocation validation for live merge ...................................................................... core: Fix Storage allocation validation for live merge Currently, same storage allocation validation is used both for cold merge and live merge. However, while for cold merge we check allocation for disks and their child snapshots, for live merge we only want to check allocation for disks. This patch fixes the validation accordingly. Change-Id: I7312f35a536ee8999a1ac73f84f7144e8a2fefa2 Bug-Url: https://bugzilla.redhat.com/1318050 Signed-off-by: Vered Volansky <vvolansk(a)redhat.com> Signed-off-by: Ala Hino <ahino(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandTest.java 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved Ala Hino: Verified -- To view, visit https://gerrit.ovirt.org/57002 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7312f35a536ee8999a1ac73f84f7144e8a2fefa2 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6.6 Gerrit-Owner: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>

1 0