Change in ovirt-engine[ovirt-engine-3.5]: extmgr: read properties files as unicode
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: extmgr: read properties files as unicode
......................................................................
extmgr: read properties files as unicode
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1255895
Change-Id: I5d443df5d097f2e8bc45daec1170037f1e615d7e
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Alon Bar-Lev: Verified
Jenkins CI: Passed CI tests
Moti Asayag: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/45198
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d443df5d097f2e8bc45daec1170037f1e615d7e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.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: fix network interfaces of imported vm using v2v
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: fix network interfaces of imported vm using v2v
......................................................................
webadmin: fix network interfaces of imported vm using v2v
The network interfaces for a VM that is imported using virt-v2v were
not defined correctly. This patch fixes it by setting the network
name and profile properly.
In addition, a new column is added the the network interfaces sub-tab
of the import VM dialog in order to show the name of the network that
the interface is declared on in the remote environment.
Change-Id: I804e988c97cf72924c82d8bb1ca4c6cab4caeebb
Bug-Url: https://bugzilla.redhat.com/1236075
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportNetworkData.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
M 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/ImportVmFromVmwareModel.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.java
6 files changed, 145 insertions(+), 46 deletions(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/44871
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I804e988c97cf72924c82d8bb1ca4c6cab4caeebb
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan(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[ovirt-engine-3.6]: core: fix network interfaces for imported vm using v2v
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: fix network interfaces for imported vm using v2v
......................................................................
core: fix network interfaces for imported vm using v2v
Add an optional field for network interface of VM that contains
the name of the network in the remote environment on which the
interface is declared. It is relevant for VMs that exist in
some external environment of course.
In addition, setting the name of network interface according to
the standard in oVirt, i.e nic1, nic2 and so on.
Change-Id: Icba912e15afd2f90799fac0c92b331740a05eb73
Bug-Url: https://bugzilla.redhat.com/1236075
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
2 files changed, 21 insertions(+), 2 deletions(-)
Approvals:
Shahar Havivi: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/44870
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icba912e15afd2f90799fac0c92b331740a05eb73
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.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]: core: change the return value of getExternalVmFromOva
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: change the return value of getExternalVmFromOva
......................................................................
core: change the return value of getExternalVmFromOva
VDSM now returns a VM, instead of a list with one VM, from
getExternalVmFromOva. This patch changes the engine accordingly.
Change-Id: Ie0b9bd2bcdb65fc4a53dfa3d1069dd64690b010a
Bug-Url: https://bugzilla.redhat.com/1236075
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
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/GetOvaInfoVDSCommand.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/VdsServerWrapper.java
4 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Shahar Havivi: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/44873
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0b9bd2bcdb65fc4a53dfa3d1069dd64690b010a
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.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]: core: rename ova related verbs
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: rename ova related verbs
......................................................................
core: rename ova related verbs
The verbs for list and convert virtual appliance were renamed in VDSM,
therefore this patch updates them in the engine.
Change-Id: If65fb591f5a98322c3643a5f0502e5d45e079f58
Bug-Url: https://bugzilla.redhat.com/1236075
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
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/ConvertOvaVDSCommand.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetOvaInfoVDSCommand.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
6 files changed, 16 insertions(+), 14 deletions(-)
Approvals:
Shahar Havivi: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/44872
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If65fb591f5a98322c3643a5f0502e5d45e079f58
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: core: Avoid too many IDE or sPAPR VSCSI devices
by shavivi＠redhat.com
Shahar Havivi has submitted this change and it was merged.
Change subject: core: Avoid too many IDE or sPAPR VSCSI devices
......................................................................
core: Avoid too many IDE or sPAPR VSCSI devices
If there are any payload devices or cloud-init is enabled, it is
possible to exceed the number of allowed sPAPR VSCSI (in ppc64) or IDE
(in x86-64) devices by having the virtual CD, the payload device and
a large number of disks in these interfaces.
This patch warns the user if that is the case and prevents the VM from
running.
Change-Id: Ief86ea10237c931490b96affaa2f97e32d617c3b
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1076488
Signed-off-by: Shahar Havivi<shavivi(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/architecture/HasMaximumNumberOfDisks.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.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
9 files changed, 81 insertions(+), 1 deletion(-)
Approvals:
Shahar Havivi: Verified; Passed CI tests
Omer Frenkel: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/44816
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief86ea10237c931490b96affaa2f97e32d617c3b
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: Vitor de Lima <vdelima(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: core: ImagesHandler.getDiskImageIds() to return ordered coll...
by laravot＠redhat.com
Liron Aravot has submitted this change and it was merged.
Change subject: core: ImagesHandler.getDiskImageIds() to return ordered collection
......................................................................
core: ImagesHandler.getDiskImageIds() to return ordered collection
Currently getDiskImageIds() returnes a collection with some random
iteration order. This patch change it to specifically return a list
ordered by the order of the retrieved images.
Change-Id: Ic69486a0969b2059bda534540cb2f717a64cc4ed
Signed-off-by: laravot(a)redhat.com <laravot(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Greg Padgett: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Daniel Erez: Looks good to me, approved
Liron Aravot: Verified
--
To view, visit https://gerrit.ovirt.org/41716
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic69486a0969b2059bda534540cb2f717a64cc4ed
Gerrit-PatchSet: 32
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Greg Padgett <gpadgett(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months
Change in ovirt-engine[master]: webadmin: Fix typo in Satellite
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: webadmin: Fix typo in Satellite
......................................................................
webadmin: Fix typo in Satellite
Change-Id: Icdc2d6dfb89495f34587bb27ea1ea83074dfcc41
Signed-off-by: Moti Asayag <masayag(a)redhat.com>
---
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins CI: Passed CI tests
Oved Ourfali: Verified; Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/45217
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icdc2d6dfb89495f34587bb27ea1ea83074dfcc41
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: 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[ovirt-engine-3.6]: webadmin: rename ova representation
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: rename ova representation
......................................................................
webadmin: rename ova representation
OVA as a source for import VM was shown as "Appliance (OVA)".
This patch changes it to "Virtual Appliance (OVA)".
Change-Id: Ib84d2562920a92334c5e9198754b634ce414c13a
Bug-Url: https://bugzilla.redhat.com/1236075
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Tal Nisan: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/44715
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib84d2562920a92334c5e9198754b634ce414c13a
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan(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[ovirt-engine-3.6]: webadmin: prevent an exception when loading vm from vmware
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: prevent an exception when loading vm from vmware
......................................................................
webadmin: prevent an exception when loading vm from vmware
This patch fixed NPE that was thrown when VMs from VMware were loaded.
Note that in that case there are no snapshot so the copy-collapse
configuration is not needed and thus this code can be removed.
Change-Id: I150a0b34fc2333bda58612bdcf4b212158f79485
Bug-Url: https://bugzilla.redhat.com/1236075
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.java
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Tal Nisan: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/44714
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I150a0b34fc2333bda58612bdcf4b212158f79485
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(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: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 5 months