Change in ovirt-engine[master]: core: Fix copyCollapse ambiguity when there are no snapshots
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: Fix copyCollapse ambiguity when there are no snapshots
......................................................................
core: Fix copyCollapse ambiguity when there are no snapshots
Import VMs with no snapshots were blocked if copyCollapse was false.
This parameter is now ignored when there are no snapshots.
Also added localized error message.
Change-Id: I0740b28452ef859d22f8a781af6fb818382cf85e
Bug-Url: https://bugzilla.redhat.com/1147011
Signed-off-by: Vered Volansky <vvolansk(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.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, 91 insertions(+), 20 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Vered Volansky: Verified
Allon Mureinik: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/44181
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0740b28452ef859d22f8a781af6fb818382cf85e
Gerrit-PatchSet: 9
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: test: Mock CpuFlagsManagerHandler in AddVmTemplateCommandTest
by ofrenkel@redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: test: Mock CpuFlagsManagerHandler in AddVmTemplateCommandTest
......................................................................
test: Mock CpuFlagsManagerHandler in AddVmTemplateCommandTest
Added CpuFlagsManagerHandler mock into AddVmTemplateCommandTest, because
it calls VmHandler.init() that's failing in absence of
CpuFlagsManagerHandler.
Also InjectorRule was made non-static to avoid dependency between tests.
Change-Id: I579539ebe469da6587f24a9c445271e86161e0c9
Signed-off-by: Shmuel Melamud <smelamud(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmChangedFieldsForNextRunQueryTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
5 files changed, 19 insertions(+), 11 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/44492
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I579539ebe469da6587f24a9c445271e86161e0c9
Gerrit-PatchSet: 4
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: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: ui: Console/ConsoleOptions multiple selections
by shavivi@redhat.com
Shahar Havivi has submitted this change and it was merged.
Change subject: ui: Console/ConsoleOptions multiple selections
......................................................................
ui: Console/ConsoleOptions multiple selections
Console button should be enable for multiple VMs.
Console Options (from the context menu) need only to be enabled for
a single VM.
Change-Id: If9cca6aba93304cabd197353556d6729d2c07363
Bug-Url: https://bugzilla.redhat.com/1217446
Signed-off-by: Shahar Havivi <shaharh(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Shahar Havivi: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/44491
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9cca6aba93304cabd197353556d6729d2c07363
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: engine: removed unused errata enums
by oourfali@redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: engine: removed unused errata enums
......................................................................
engine: removed unused errata enums
Change-Id: Ib17f86defb580511b79097443d31fe1f545d4ba2
Signed-off-by: Greg Sheremeta <gshereme(a)redhat.com>
---
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
3 files changed, 0 insertions(+), 16 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Oved Ourfali: Verified; Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/44579
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib17f86defb580511b79097443d31fe1f545d4ba2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Sheremeta <gshereme(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: engine: tabs --> spaces in AppErrors.properties
by oourfali@redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: engine: tabs --> spaces in AppErrors.properties
......................................................................
engine: tabs --> spaces in AppErrors.properties
Change-Id: I8f8804ca94f4052c95f033c1e9b41d0161ac79a3
Signed-off-by: Greg Sheremeta <gshereme(a)redhat.com>
---
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
1 file changed, 41 insertions(+), 42 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Oved Ourfali: Verified; Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/44578
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f8804ca94f4052c95f033c1e9b41d0161ac79a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Sheremeta <gshereme(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: webadmin: filter VMs that are running in VMware
by ahadas@redhat.com
Arik Hadas has submitted this change and it was merged.
Change subject: webadmin: filter VMs that are running in VMware
......................................................................
webadmin: filter VMs that are running in VMware
VMs that are running in VMware will not be presented in the import
VM dialog as candidates to be imported. A warning that says there
are running VMs in the remote system that have been filtered will
be displayed instead.
Change-Id: I8896fed326bfb16c7c3f9fe16a0ebdd9bef99540
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
2 files changed, 14 insertions(+), 1 deletion(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/44423
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8896fed326bfb16c7c3f9fe16a0ebdd9bef99540
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: webadmin: add warnings in the import vm dialog
by ahadas@redhat.com
Arik Hadas has submitted this change and it was merged.
Change subject: webadmin: add warnings in the import vm dialog
......................................................................
webadmin: add warnings in the import vm dialog
The import VM dialog is enhanced to be able to present warnings
as well. Error is displayed with error image and red foreground
color and warning is displayed with warning image and black
foreground color. Moreover, error has a higher priority to be
displayed than a warning.
Change-Id: I0eefd7693faf5e4cf56b0c08048608a484115342
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.ui.xml
3 files changed, 79 insertions(+), 22 deletions(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/44422
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0eefd7693faf5e4cf56b0c08048608a484115342
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: webadmin: import virtual appliance
by ahadas@redhat.com
Arik Hadas has submitted this change and it was merged.
Change subject: webadmin: import virtual appliance
......................................................................
webadmin: import virtual appliance
Add the ability to import a VM from an OVA file in the import
VM dialog.
Change-Id: I0160358d4c8783e92c713fd896a55c5de8be7c7a
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportSource.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromOvaModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.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/ApplicationConstants.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.ui.xml
11 files changed, 308 insertions(+), 29 deletions(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/44131
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0160358d4c8783e92c713fd896a55c5de8be7c7a
Gerrit-PatchSet: 11
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-node-plugin-vdsm[master]: spec: adjust release and changelog
by dougsland@redhat.com
Douglas Schilling Landgraf has submitted this change and it was merged.
Change subject: spec: adjust release and changelog
......................................................................
spec: adjust release and changelog
Change-Id: Ic27786d884d9b7f88f9e16ec7709b80ed1718e0d
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Reviewed-on: https://gerrit.ovirt.org/44557
---
M configure.ac
M ovirt-node-plugin-vdsm.spec.in
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/44557
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic27786d884d9b7f88f9e16ec7709b80ed1718e0d
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-node-plugin-vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in jenkins[master]: publish-rpms-nightly-master: fix HE setup references
by sbonazzo@redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: publish-rpms-nightly-master: fix HE setup references
......................................................................
publish-rpms-nightly-master: fix HE setup references
Change-Id: Iac10f542dd84d1be31f2aee4c3be92e5c194f4aa
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M jobs/confs/projects/ovirt/publish-rpms-nightly-master.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me; Ready for merge
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/44554
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac10f542dd84d1be31f2aee4c3be92e5c194f4aa
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
9 years, 5 months