Change in ovirt-engine[master]: engine: Adjust GetAllChildVlanInterfacesQuery to accept any ...
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: engine: Adjust GetAllChildVlanInterfacesQuery to accept any vlan name
......................................................................
engine: Adjust GetAllChildVlanInterfacesQuery to accept any vlan name
Changes done in the command-
1. The query uses iface.getBaseInterface() and iface.getVlanId() instead
of determining this values from the vlan device name (since its format is
no longer- baseIface.vlanId).
2. The query uses the new methods indroduced in NetworkUtils instead of
the old ones (that should be removed in a following patch).
Change-Id: Ia1cc427a951ac1647469936cff519c3d440bc75a
Bug-Url: https://bugzilla.redhat.com/1091863
Bug-Url: https://bugzilla.redhat.com/999975
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alona Kaplan: Verified
Moti Asayag: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/26612
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1cc427a951ac1647469936cff519c3d440bc75a
Gerrit-PatchSet: 12
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: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years
Change in ovirt-engine[master]: engine: Adjust DetachNetworkFromVdsInterfaceCommand to accep...
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: engine: Adjust DetachNetworkFromVdsInterfaceCommand to accept any vlan name
......................................................................
engine: Adjust DetachNetworkFromVdsInterfaceCommand to accept any vlan name
Changes done in the command-
1. The command uses iface.getBaseInterface() and iface.getVlanId() instead
of determining this values from the vlan device name (since its format is
no longer- baseIface.vlanId).
2. The command uses the new methods indroduced in NetworkUtils instead of
the old ones (that should be removed in a following patch).
Change-Id: I2c90bbbc1b3d6bd8df87c83301956556d1c6eafd
Bug-Url: https://bugzilla.redhat.com/1091863
Bug-Url: https://bugzilla.redhat.com/999975
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
1 file changed, 13 insertions(+), 12 deletions(-)
Approvals:
Mike Kolesnik: Looks good to me, approved
Alona Kaplan: Verified
--
To view, visit http://gerrit.ovirt.org/26611
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2c90bbbc1b3d6bd8df87c83301956556d1c6eafd
Gerrit-PatchSet: 12
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: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years
Change in ovirt-engine[master]: engine: RemoveNetworksByLabelParametersBuilder accepts any v...
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: engine: RemoveNetworksByLabelParametersBuilder accepts any vlan device name
......................................................................
engine: RemoveNetworksByLabelParametersBuilder accepts any vlan device name
Changes done in this patch-
1. The builder uses iface.getBaseInterface() and iface.getVlanId() instead
of determining this values from the vlan device name (since its format is
no longer- baseIface.vlanId).
2. The builder uses the new methods indroduced in NetworkUtils instead of
the old ones (that should be removed in a following patch).
Change-Id: If22225ae3d971aa6072b161df0965dd663deff1e
Bug-Url: https://bugzilla.redhat.com/1091863
Bug-Url: https://bugzilla.redhat.com/999975
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mike Kolesnik: Looks good to me, approved
Alona Kaplan: Verified
--
To view, visit http://gerrit.ovirt.org/26610
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If22225ae3d971aa6072b161df0965dd663deff1e
Gerrit-PatchSet: 12
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: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years
Change in ovirt-engine[master]: engine: Adjust MigrateVmCommand to accept any vlan device name
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: engine: Adjust MigrateVmCommand to accept any vlan device name
......................................................................
engine: Adjust MigrateVmCommand to accept any vlan device name
Changes done in the command-
1. The command uses iface.getBaseInterface() and iface.getVlanId() instead
of determining this values from the vlan device name (since its format is
no longer- baseIface.vlanId).
2. The command uses the new methods indroduced in NetworkUtils instead of
the old ones (that should be removed in a following patch).
Change-Id: I0d8989320d39ef74d55574cfb1da0f5efe4ac6ec
Bug-Url: https://bugzilla.redhat.com/1091863
Bug-Url: https://bugzilla.redhat.com/999975
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mike Kolesnik: Looks good to me, approved
Alona Kaplan: Verified
--
To view, visit http://gerrit.ovirt.org/26609
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d8989320d39ef74d55574cfb1da0f5efe4ac6ec
Gerrit-PatchSet: 12
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: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years
Change in ovirt-engine[master]: engine: Adjust NetworkUtils to accept any vlan device name- ...
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: engine: Adjust NetworkUtils to accept any vlan device name- phase 1
......................................................................
engine: Adjust NetworkUtils to accept any vlan device name- phase 1
The changes in this class will be done in two phases.
Phase 1 (in this patch)-
Adjusting NetworkUtils to get the underling interface name of the nic by
using VdsNetworkInterface.getBaseInterface() instead of determine the
underling nicName from the vlan device name.
In this patch old methods signatures are NOT changed in order to avoid
breaking the compilation. If a change to the signature is needed,
a new method overloads the old one is added.
Phase 2-
Removing the old methods.
Will be done after all the usages of the old methods are
replaced/fixed.
Change-Id: I426159c169b1fa478776abafb38cb7ae6fdac3be
Bug-Url: https://bugzilla.redhat.com/1091863
Bug-Url: https://bugzilla.redhat.com/999975
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
2 files changed, 35 insertions(+), 3 deletions(-)
Approvals:
Mike Kolesnik: Looks good to me, approved
Alona Kaplan: Verified
--
To view, visit http://gerrit.ovirt.org/26608
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I426159c169b1fa478776abafb38cb7ae6fdac3be
Gerrit-PatchSet: 12
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: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years
Change in ovirt-engine[master]: engine: remove unnecessary parameters from VBOB
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: engine: remove unnecessary parameters from VBOB
......................................................................
engine: remove unnecessary parameters from VBOB
currVlan and networkVlan are passed and initilaized through some methods in
VBOB. But they are not actually used anywhere.
Change-Id: I252f1e789a346d045afdf32d638c163abcbe03c1
Bug-Url: https://bugzilla.redhat.com/1091863
Bug-Url: https://bugzilla.redhat.com/999975
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
1 file changed, 4 insertions(+), 26 deletions(-)
Approvals:
Mike Kolesnik: Looks good to me, approved
Alona Kaplan: Verified
--
To view, visit http://gerrit.ovirt.org/26607
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I252f1e789a346d045afdf32d638c163abcbe03c1
Gerrit-PatchSet: 12
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: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years
Change in ovirt-engine[master]: engine: Read "vlanid" and "interface" from VLAN information
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: engine: Read "vlanid" and "interface" from VLAN information
......................................................................
engine: Read "vlanid" and "interface" from VLAN information
If vsdm reports vlanid as an independent field the engine should use it
instead of deducing it from vlan name.
Change-Id: I282c2db9a0fd023ac39fac157ce1c0178800d3af
Bug-Url: https://bugzilla.redhat.com/1091863
Bug-Url: https://bugzilla.redhat.com/999975
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
2 files changed, 12 insertions(+), 5 deletions(-)
Approvals:
Mike Kolesnik: Looks good to me, approved
Alona Kaplan: Verified
--
To view, visit http://gerrit.ovirt.org/26606
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I282c2db9a0fd023ac39fac157ce1c0178800d3af
Gerrit-PatchSet: 12
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: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years
Change in ovirt-engine[master]: engine: adding base_interface column to vds_interface table
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: engine: adding base_interface column to vds_interface table
......................................................................
engine: adding base_interface column to vds_interface table
We should accept vlan devices identified by any name (and not only
baseIface.vlanId)
Therefore the baseInterface name cannot longer be determined from the
vlan device name.
If the interface is vlan the columns will contain the base interface
name.
Change-Id: I87ac5121b9e7d3b74f5557336e5d504ef91b7702
Bug-Url: https://bugzilla.redhat.com/1091863
Bug-Url: https://bugzilla.redhat.com/999975
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NetworkInterfaceValidator.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoDbFacadeImpl.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/03_05_0370_add_base_interface_column_to_vds_interfaces.sql
8 files changed, 55 insertions(+), 8 deletions(-)
Approvals:
Mike Kolesnik: Looks good to me, approved
Eli Mesika: Looks good to me, but someone else must approve
Alona Kaplan: Verified
--
To view, visit http://gerrit.ovirt.org/26605
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87ac5121b9e7d3b74f5557336e5d504ef91b7702
Gerrit-PatchSet: 12
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: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years
Change in ovirt-engine[ovirt-engine-3.4.1]: restapi: Don't use inner classes in LinkBuilder
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: restapi: Don't use inner classes in LinkBuilder
......................................................................
restapi: Don't use inner classes in LinkBuilder
We use anonymous classes in a rather unusual way in the LinkBuilder, we
do the follwing:
whatever.setBody(new Body(){{setType(type);}});
Instead of this:
Body body = new Body();
body.setType(type);
whatever.setBody(body);
The former is probably nicer syntax, but it has the side effect of
introducing a synthetic field in the subclass of Body that the compiler
generates automatically. This synthetic field is a reference to the
outer LinkHelper class. When Jackson tries to convert this object to
JSON it finds the synthetic field, and tries to serialize it as well.
This fails because the LinkHelper class doesn't have a suitable
constructor.
The net effect is an error when the server tries to return an error
message to the user.
The solution is to avoid completely the anonymous classes, and thus the
synthetic fields.
Change-Id: I10e0ecb68b3e0d412de486c3a38dbefa3c4dd9d2
Bug-Url: https://bugzilla.redhat.com/1093755
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 83ce373d29df3e5f777ad0f56948d1c7d9388c55)
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/LinkBuilder.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java
2 files changed, 16 insertions(+), 6 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/27426
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10e0ecb68b3e0d412de486c3a38dbefa3c4dd9d2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4.1
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
10 years
Change in ovirt-engine[ovirt-engine-3.4]: restapi: Don't use inner classes in LinkBuilder
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: restapi: Don't use inner classes in LinkBuilder
......................................................................
restapi: Don't use inner classes in LinkBuilder
We use anonymous classes in a rather unusual way in the LinkBuilder, we
do the follwing:
whatever.setBody(new Body(){{setType(type);}});
Instead of this:
Body body = new Body();
body.setType(type);
whatever.setBody(body);
The former is probably nicer syntax, but it has the side effect of
introducing a synthetic field in the subclass of Body that the compiler
generates automatically. This synthetic field is a reference to the
outer LinkHelper class. When Jackson tries to convert this object to
JSON it finds the synthetic field, and tries to serialize it as well.
This fails because the LinkHelper class doesn't have a suitable
constructor.
The net effect is an error when the server tries to return an error
message to the user.
The solution is to avoid completely the anonymous classes, and thus the
synthetic fields.
Change-Id: I10e0ecb68b3e0d412de486c3a38dbefa3c4dd9d2
Bug-Url: https://bugzilla.redhat.com/1093755
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 3e2af7c52118061c058aacf4abfb52162a8a282c)
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/LinkBuilder.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java
2 files changed, 16 insertions(+), 6 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/27420
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10e0ecb68b3e0d412de486c3a38dbefa3c4dd9d2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years