Change in ovirt-engine[ovirt-engine-3.6]: webadmin: fix inaccurate error message
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: webadmin: fix inaccurate error message
......................................................................
webadmin: fix inaccurate error message
A storage domain that contains a disk of a vm which is in a state other
than "Down", cannot be taken down to maintenance.
If that's the situation, and one tries to take it down to maintenance,
he gets an error message telling him that "Active VMs were detected".
That is inaccurate, since this error message will arise in any vm state
other than "Down".
This patch fixes the error message.
Change-Id: I87e061d716f045fb1549ff8713eaa16d990c0928
Bug-Url: https://bugzilla.redhat.com/1061194
Signed-off-by: Idan Shaby <ishaby(a)redhat.com>
---
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Allon Mureinik: Looks good to me, approved
Idan Shaby: Verified
--
To view, visit https://gerrit.ovirt.org/44585
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87e061d716f045fb1549ff8713eaa16d990c0928
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Idan Shaby <ishaby(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[ovirt-engine-3.6]: webadmin: Rename column in add/edit SCSI/FC SD
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: webadmin: Rename column in add/edit SCSI/FC SD
......................................................................
webadmin: Rename column in add/edit SCSI/FC SD
Rename column in add/edit SCSI/FC Storage Domain
dialog from "Size to Add" to "Additional Size"
Change-Id: I94a1a010ee379f95e45e7d2618cdc39288f31c87
Bug-Url: https://bugzilla.redhat.com/609689
Signed-off-by: Fred Rolland <frolland(a)redhat.com>
---
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageLunToTargetList.java
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Allon Mureinik: Looks good to me, approved
Freddy Rolland: Verified
--
To view, visit https://gerrit.ovirt.org/44588
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94a1a010ee379f95e45e7d2618cdc39288f31c87
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Freddy Rolland <frolland(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Fred Rolland <frolland(a)redhat.com>
Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[ovirt-engine-3.6]: restapi: Remove unneeded calls in SD extend
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: restapi: Remove unneeded calls in SD extend
......................................................................
restapi: Remove unneeded calls in SD extend
Removing unneeded code when extending a storage domain.
The same logic already exists in ExtendSANStorageDomainCommand.
Now, the 'host' parameter is not needed and can be removed from the update
storage domain definition in the rsdl.
Backward compatibility is preserved as the 'host' parameter is not
removed from XML schema.
If the parameter is present, it will be ignored.
Change-Id: I45128d928421e27f9eac2b73ac6fc03f1682f545
Bug-Url: https://bugzilla.redhat.com/1213961
Signed-off-by: Fred Rolland <frolland(a)redhat.com>
---
M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
2 files changed, 4 insertions(+), 36 deletions(-)
Approvals:
Ori Liel: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Looks good to me, but someone else must approve
Freddy Rolland: Verified
--
To view, visit https://gerrit.ovirt.org/44594
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45128d928421e27f9eac2b73ac6fc03f1682f545
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Freddy Rolland <frolland(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Fred Rolland <frolland(a)redhat.com>
Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[ovirt-engine-3.6]: engine: Completed task still shown as 'running' in UI
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: engine: Completed task still shown as 'running' in UI
......................................................................
engine: Completed task still shown as 'running' in UI
Currently when SPM host goes down due to connectivity issue,
VdsNotRespondingTreatment command is left forever 'running'
(hourglass icon) in the WebAdmin tasks pane.
This happens becuase when SPM host goes down the datacenter
should go down, and thus an internal command:
SetStoragePoolStatus is invoked, and there is a mixup in
the Execution-Context.
This patch solves this bug locally, although a similar
issue may exist in other places and handling of
CommandContext and ExecutionContext should be revisited.
Bug-Url: https://bugzilla.redhat.com/1145099
Change-Id: I4f5fbaef3e8c57fbad7997cb67282a6c163b6b03
Signed-off-by: Ori Liel <oliel(a)redhat.com>
(cherry picked from commit 7714abd1dc71275cc109d57f1849dd9e68e7c6b2)
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionContext.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/VdsNotRespondingTreatmentCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java
3 files changed, 47 insertions(+), 26 deletions(-)
Approvals:
Ori Liel: Verified
Jenkins CI: Passed CI tests
Oved Ourfali: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/44595
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f5fbaef3e8c57fbad7997cb67282a6c163b6b03
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[ovirt-engine-3.6]: core: Add StorageServerConnectionExtension entity
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: core: Add StorageServerConnectionExtension entity
......................................................................
core: Add StorageServerConnectionExtension entity
Add the entity, its DAO and the DAO tests
Bug-Url: https://bugzilla.redhat.com/1239266
Change-Id: Iffdb92ff14ab9da76553acabcfa4256ac2fb870e
Signed-off-by: Tal Nisan <tnisan(a)redhat.com>
---
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/StorageServerConnectionExtension.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java
A backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionExtensionDao.java
A backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionExtensionDaoImpl.java
A backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionExtensionDaoTest.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M packaging/dbscripts/storages_san_sp.sql
A packaging/dbscripts/upgrade/03_06_1780_create_storage_server_connection_extension_table.sql
8 files changed, 412 insertions(+), 0 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Allon Mureinik: Looks good to me, approved
Amit Aviram: Verified
--
To view, visit https://gerrit.ovirt.org/44589
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffdb92ff14ab9da76553acabcfa4256ac2fb870e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Amit Aviram <aaviram(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Amit Aviram <aaviram(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: Allow @Spy annotations in Arquillian tests
by rgolan＠redhat.com
Roy Golan has submitted this change and it was merged.
Change subject: Allow @Spy annotations in Arquillian tests
......................................................................
Allow @Spy annotations in Arquillian tests
Add a spi extension which hooks into the bean creation process and
wraps with @Spy annotated fields with a Mockito spy
Change-Id: I6b214b806942d6b5212bb262d45eb277aa6dbc44
Signed-off-by: Roman Mohr <rmohr(a)redhat.com>
---
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/arquillian/mockito/SpyAnnotation.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/SchedulingManagerTest.java
A backend/manager/modules/bll/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
3 files changed, 87 insertions(+), 1 deletion(-)
Approvals:
Roman Mohr: Verified
Jenkins CI: Passed CI tests
Roy Golan: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/43957
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b214b806942d6b5212bb262d45eb277aa6dbc44
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Liran Zelkha <lzelkha(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: engine: Display message for unknown CPU type
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: engine: Display message for unknown CPU type
......................................................................
engine: Display message for unknown CPU type
When creating a VM, if CPU type set for the cluster is unknown, display
descriptive message to the user instead of failing with NPE.
Change-Id: I23d32cba3271ea10b7da42dcc20b3237e7cef9f5
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1243038
Signed-off-by: Shmuel Melamud <smelamud(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
6 files changed, 19 insertions(+), 7 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Shmuel Leib Melamud: Verified
Omer Frenkel: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/43871
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23d32cba3271ea10b7da42dcc20b3237e7cef9f5
Gerrit-PatchSet: 7
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shmuel Leib Melamud <smelamud(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Shmuel Leib Melamud <smelamud(a)redhat.com>
Gerrit-Reviewer: Shmuel Melamud <smelamud(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: engine: Reset InjectorRule after each test case
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: engine: Reset InjectorRule after each test case
......................................................................
engine: Reset InjectorRule after each test case
Reset InjectorRule after each test case.
That should discover all tests that rely on
the order of tests execution.
Change-Id: I5759a023ad23a2bf1088d78247889ac149bf7c35
Signed-off-by: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InjectorRule.java
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
Jenkins CI: Passed CI tests
Allon Mureinik: Looks good to me, but someone else must approve
Omer Frenkel: Looks good to me, but someone else must approve
Oved Ourfali: Looks good to me, approved
Yevgeny Zaspitsky: Verified
--
To view, visit https://gerrit.ovirt.org/44500
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5759a023ad23a2bf1088d78247889ac149bf7c35
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: core: Do not use Injector in ClusterValidator
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: Do not use Injector in ClusterValidator
......................................................................
core: Do not use Injector in ClusterValidator
Pass CpuFlagsManagerHandler in ClusterValidator constructor instead of
using Injector.get().
Change-Id: I577a52e99439fe1af3c2ad59666d67105f1dc8ce
Signed-off-by: Shmuel Melamud <smelamud(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/ClusterValidatorTest.java
4 files changed, 39 insertions(+), 37 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Shmuel Leib Melamud: Verified
Omer Frenkel: Looks good to me, approved
Yevgeny Zaspitsky: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/44434
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I577a52e99439fe1af3c2ad59666d67105f1dc8ce
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shmuel Leib Melamud <smelamud(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Shmuel Leib Melamud <smelamud(a)redhat.com>
Gerrit-Reviewer: Shmuel Melamud <smelamud(a)redhat.com>
Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: core: GetErrataCountsForVmQuery with null VM
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: GetErrataCountsForVmQuery with null VM
......................................................................
core: GetErrataCountsForVmQuery with null VM
This query should fail if the relevant VM is null. However, this check
is done too late, and the VM is already used before it, which will, of
course, result in a NullPointerException.
This patch fixes Coverity CID 1315379.
Change-Id: Ic409124b15631a8217230d02a02af09ceaeef314
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErrataCountsForVmQuery.java
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
Oved Ourfali: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/44529
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic409124b15631a8217230d02a02af09ceaeef314
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months