- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: engine: Read "vlanid" and "interface" from VLAN information
by alkaplan＠redhat.com 07 May '14

07 May '14

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

1 0

Change in ovirt-engine[master]: engine: adding base_interface column to vds_interface table
by alkaplan＠redhat.com 07 May '14

07 May '14

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

1 0

Change in ovirt-engine[ovirt-engine-3.4.1]: restapi: Don't use inner classes in LinkBuilder
by oourfali＠redhat.com 07 May '14

07 May '14

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

1 0

Change in ovirt-engine[ovirt-engine-3.4]: restapi: Don't use inner classes in LinkBuilder
by oourfali＠redhat.com 07 May '14

07 May '14

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

1 0

Change in ovirt-engine[ovirt-engine-3.4]: Cleaning a message due to a branding issue
by oourfali＠redhat.com 07 May '14

07 May '14

Oved Ourfali has submitted this change and it was merged. Change subject: Cleaning a message due to a branding issue ...................................................................... Cleaning a message due to a branding issue Cleaning a message to avoid a branding issue downstream Change-Id: Ia2ae02be873f57ab24ba264af108a9efb5f895cf Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1080908 Signed-off-by: Simone Tiraboschi <stirabos(a)redhat.com> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Sandro Bonazzola: Looks good to me, approved Simone Tiraboschi: Verified -- To view, visit http://gerrit.ovirt.org/27404 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2ae02be873f57ab24ba264af108a9efb5f895cf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Simone Tiraboschi <stirabos(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[ovirt-engine-3.4]: core: SuperUser of DataCenter X cannot approve a host under ...
by oourfali＠redhat.com 07 May '14

07 May '14

Oved Ourfali has submitted this change and it was merged. Change subject: core: SuperUser of DataCenter X cannot approve a host under this Data Center ...................................................................... core: SuperUser of DataCenter X cannot approve a host under this Data Center This patch address the issue above, where you need the following permissions when approving a host, each from another command that is run in this flow: 1. ChangeVdsCluster (as we change the cluster) - checks for EDIT_HOST_CONFIGURATION action group both on the host, and the destination cluster 2. UpdateVds (as we can edit other stuff as well) - checks for EDIT_HOST_CONFIGURATION action group on the host 3. ApproveVdsCommand - checks for CREATE_HOST action group on the host itself, the cluster, the DC, or System (as I wrote above). This patch changes the requirement in #1 to include EDIT_HOST_CONFIGURATION on the host only if the host is NOT in a PendingApproval state, as in the PendingApproval state there might not be any permissions on the host, as the host is in the Default Cluster, and the user might not have permissions on it. Change-Id: Ia59a51e4e3ebf184e0672a077b6dc0d16e60eb8e Bug-Url: https://bugzilla.redhat.com/1090660 Signed-off-by: Oved Ourfali <oourfali(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Yair Zaslavsky: Looks good to me, approved Oved Ourfali: Verified -- To view, visit http://gerrit.ovirt.org/27349 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia59a51e4e3ebf184e0672a077b6dc0d16e60eb8e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-reports[master]: packaging: added leading question mark to dist tag
by ydary＠redhat.com 07 May '14

07 May '14

Yaniv Dary has submitted this change and it was merged. Change subject: packaging: added leading question mark to dist tag ...................................................................... packaging: added leading question mark to dist tag when using %{dist} to mark a package as having been built for a specific distribution, we need to add it to Release field with a leading question mark. Change-Id: I1a2ea23df3cb73969d698440e26a9e4e861e2a9a Bug-Url: https://bugzilla.redhat.com/1094024 Signed-off-by: Yaniv Dary <ydary(a)redhat.com> --- M ovirt-engine-reports.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alon Bar-Lev: Looks good to me, but someone else must approve Sandro Bonazzola: Looks good to me, but someone else must approve Yaniv Dary: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/27357 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a2ea23df3cb73969d698440e26a9e4e861e2a9a Gerrit-PatchSet: 2 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <ydary(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com> Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-dwh[master]: packaging: added leading question mark to dist tag
by ydary＠redhat.com 07 May '14

07 May '14

Yaniv Dary has submitted this change and it was merged. Change subject: packaging: added leading question mark to dist tag ...................................................................... packaging: added leading question mark to dist tag when using %{dist} to mark a package as having been built for a specific distribution, we need to add it to Release field with a leading question mark. Change-Id: I8eba6521069049e6535f0eceb2b35764f215afdb Bug-Url: https://bugzilla.redhat.com/1093599 Signed-off-by: Yaniv Dary <ydary(a)redhat.com> --- M ovirt-engine-dwh.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alon Bar-Lev: Looks good to me, but someone else must approve Sandro Bonazzola: Looks good to me, but someone else must approve Yaniv Dary: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/27358 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8eba6521069049e6535f0eceb2b35764f215afdb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <ydary(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com> Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: backend: set HttpOnly for all cookies
by awels＠redhat.com 06 May '14

06 May '14

Alexander Wels has submitted this change and it was merged. Change subject: backend: set HttpOnly for all cookies ...................................................................... backend: set HttpOnly for all cookies Change-Id: I25ae26677c99f94a5e6d7cfe39444811d13ec29c Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com> --- M backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml M backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/DocsServlet.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java M backend/manager/modules/welcome/src/main/webapp/WEB-INF/web.xml M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml M frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml 8 files changed, 41 insertions(+), 0 deletions(-) Approvals: Alexander Wels: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/25915 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25ae26677c99f94a5e6d7cfe39444811d13ec29c Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Anonymous Coward #1000526 Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine-sdk[sdk_3.4]: codegen: Allow = in replaced function parameters
by juan.hernandez＠redhat.com 06 May '14

06 May '14

Juan Hernandez has submitted this change and it was merged. Change subject: codegen: Allow = in replaced function parameters ...................................................................... codegen: Allow = in replaced function parameters The code generator replaces some of the functions in the params.py file generated by generateDS.py. To locate these functions it uses regular expressions, but it doesn't take into account that parameters can contain the equals sign. In version 2.9a of generateDS.py the generated functions didn't have parameters with default values, so the equals sign wasn't present: def parseString(inString) In version 2.12a of generateDS.py the generated functions have parameters with default values: def parseString(inString, silence=False) This patch changes the code generator so that it will locate the functions correctly in both cases, with or without the equals sign. Change-Id: I7eccef883def440e04e47a7e04c476a3d3348a91 Related: https://bugzilla.redhat.com/1091688 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> (cherry picked from commit 7d9add1515fedbb6ce87c39331f35de19563d190) --- M src/codegen/xsd/genparams.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/27429 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7eccef883def440e04e47a7e04c476a3d3348a91 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk Gerrit-Branch: sdk_3.4 Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0