- Engine-commits - oVirt List Archives

Change in ovirt-engine-sdk[sdk_3.5]: codegen: Fix naming conflict
by juan.hernandez＠redhat.com 18 Jul '14

18 Jul '14

Juan Hernandez has submitted this change and it was merged. Change subject: codegen: Fix naming conflict ...................................................................... codegen: Fix naming conflict Currently the code generator generates conflicting classes when the calculated name of a entity is the same of a collection. For example, for the following collection: /hosts/{host:id}/storage Note that the name of the collection doesn't end in "s". As a result the code generator produces a HostStorage class for the collection and a HostStorage (same name) class for the entity. Due to the order they are generated the collection class overwrites the entity class. To avoid this issue this patch changes the code generator so that it will automaticall add the "s" to the collection class name when there is a conflict like this. Change-Id: Ia408b8e16234595b4454c2d252f5fec16414ca49 Bug-Url: https://bugzilla.redhat.com/1120502 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> (cherry picked from commit 6bc4526a9f5fa761cd9f64cc7b311fd57e1c3628) --- M src/codegen/rsdl/rsdlcodegen.py 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30251 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia408b8e16234595b4454c2d252f5fec16414ca49 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk Gerrit-Branch: sdk_3.5 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

Change in ovirt-engine-sdk[master]: codegen: Fix naming conflict
by juan.hernandez＠redhat.com 18 Jul '14

18 Jul '14

Juan Hernandez has submitted this change and it was merged. Change subject: codegen: Fix naming conflict ...................................................................... codegen: Fix naming conflict Currently the code generator generates conflicting classes when the calculated name of a entity is the same of a collection. For example, for the following collection: /hosts/{host:id}/storage Note that the name of the collection doesn't end in "s". As a result the code generator produces a HostStorage class for the collection and a HostStorage (same name) class for the entity. Due to the order they are generated the collection class overwrites the entity class. To avoid this issue this patch changes the code generator so that it will automaticall add the "s" to the collection class name when there is a conflict like this. Change-Id: Ia408b8e16234595b4454c2d252f5fec16414ca49 Bug-Url: https://bugzilla.redhat.com/1120502 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M src/codegen/rsdl/rsdlcodegen.py 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Ravi Nori: Looks good to me, but someone else must approve Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30210 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia408b8e16234595b4454c2d252f5fec16414ca49 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine-cli[cli_3.5]: cli: Don't fail when there is no tty
by juan.hernandez＠redhat.com 18 Jul '14

18 Jul '14

Juan Hernandez has submitted this change and it was merged. Change subject: cli: Don't fail when there is no tty ...................................................................... cli: Don't fail when there is no tty Currently we always try to open the /dev/tty device, but this will fail in environments where there isn't a terminal available, like when running from a cron script. This patch changes the CLI so that it won't crash in these situations. Change-Id: Ie68152e171248b5b18296773b2cd5acaf98d34f3 Bug-Url: https://bugzilla.redhat.com/1119412 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> (cherry picked from commit a2e573477e38bdc2ba4b3c778f4b69b3928d57cc) --- M src/cli/platform/posix/terminal.py 1 file changed, 26 insertions(+), 14 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30250 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie68152e171248b5b18296773b2cd5acaf98d34f3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-cli Gerrit-Branch: cli_3.5 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

Change in ovirt-engine-cli[master]: cli: Don't fail when there is no tty
by juan.hernandez＠redhat.com 18 Jul '14

18 Jul '14

Juan Hernandez has submitted this change and it was merged. Change subject: cli: Don't fail when there is no tty ...................................................................... cli: Don't fail when there is no tty Currently we always try to open the /dev/tty device, but this will fail in environments where there isn't a terminal available, like when running from a cron script. This patch changes the CLI so that it won't crash in these situations. Change-Id: Ie68152e171248b5b18296773b2cd5acaf98d34f3 Bug-Url: https://bugzilla.redhat.com/1119412 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M src/cli/platform/posix/terminal.py 1 file changed, 26 insertions(+), 14 deletions(-) Approvals: Ravi Nori: Looks good to me, but someone else must approve Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30238 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie68152e171248b5b18296773b2cd5acaf98d34f3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-cli Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[ovirt-engine-3.5]: aaa: change code of AddUser and AddGroup
by piotr.kliczewski＠gmail.com 18 Jul '14

18 Jul '14

Piotr Kliczewski has submitted this change and it was merged. Change subject: aaa: change code of AddUser and AddGroup ...................................................................... aaa: change code of AddUser and AddGroup removing the check from canDoAction to check if entity exists in directory as these checks are done both by rest-api and gui. Bug-Url: https://bugzilla.redhat.com/1120609 Topic: AAA Change-Id: If841c8d30d6ab2c5d06b1637cde93cfc65598a96 Signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SyncUsers.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddGroupParameters.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddUserParameters.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbGroupDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java 13 files changed, 127 insertions(+), 190 deletions(-) Approvals: Alon Bar-Lev: Looks good to me, but someone else must approve Yair Zaslavsky: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30207 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If841c8d30d6ab2c5d06b1637cde93cfc65598a96 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Tal Nisan <tnisan(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[ovirt-engine-3.5]: extapi: use collection instead of list
by piotr.kliczewski＠gmail.com 18 Jul '14

18 Jul '14

Piotr Kliczewski has submitted this change and it was merged. Change subject: extapi: use collection instead of list ...................................................................... extapi: use collection instead of list primitive types are better, no real reason to use list in these. Topic: AAA Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720 Change-Id: I0555f7f10bae370c3605b5253cab09620ff770bb Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com> --- M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java M backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java M backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Acct.java M backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java M backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java M backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java 8 files changed, 39 insertions(+), 37 deletions(-) Approvals: Alon Bar-Lev: Verified Yair Zaslavsky: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30248 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0555f7f10bae370c3605b5253cab09620ff770bb Gerrit-PatchSet: 2 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: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Tal Nisan <tnisan(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[ovirt-engine-3.5]: aaa: remove proprietary logger
by piotr.kliczewski＠gmail.com 18 Jul '14

18 Jul '14

Piotr Kliczewski has submitted this change and it was merged. Change subject: aaa: remove proprietary logger ...................................................................... aaa: remove proprietary logger Topic: AAA Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720 Change-Id: I3bbaeba654ecc1f585a285af2863dd53506f462b Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com> --- M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Alon Bar-Lev: Verified Yair Zaslavsky: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30237 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3bbaeba654ecc1f585a285af2863dd53506f462b Gerrit-PatchSet: 2 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: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Tal Nisan <tnisan(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[ovirt-engine-3.5]: restapi: Different realms for different URLs
by piotr.kliczewski＠gmail.com 18 Jul '14

18 Jul '14

Piotr Kliczewski has submitted this change and it was merged. Change subject: restapi: Different realms for different URLs ...................................................................... restapi: Different realms for different URLs Currently we deploy the RESTAPI application twice, once for the /api URL and another time for the /ovirt-engine/api URL. But both deployments use the same basic authentication realm. As a result when a browser authenticates with one URL it will be automatically authenticated with the other one, as the browser will remember the credentials and send them automatically if the realm is the same. To avoid this issue this patch changes the names of the realms, so that they will be different. Change-Id: I36140bf236b7043f3b813863ce8db635012a11ce Bug-Url: https://bugzilla.redhat.com/1077441 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> (cherry picked from commit 94583560f705e2cbf0dde33c306a9c17add96dd4) --- M Makefile M backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30234 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36140bf236b7043f3b813863ce8db635012a11ce Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: aaa: Fixing search to search by authz
by yzaslavs＠redhat.com 18 Jul '14

18 Jul '14

Yair Zaslavsky has submitted this change and it was merged. Change subject: aaa: Fixing search to search by authz ...................................................................... aaa: Fixing search to search by authz In this patch, search is fixed to search by authz. In addition - at frontend, the drop down list for domains shows a combination of (profile,authz) (i.e - (profile,domain) Bug-Url: https://bugzilla.redhat.com/1117488 Change-Id: Ic1867577a900e2c7a815d443b771e2576bd8aea2 Topic: AAA Signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAAAProfileListQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/ProfileEntry.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.ui.xml M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml 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/users/AdElementListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPortalAdElementListModel.java 9 files changed, 102 insertions(+), 37 deletions(-) Approvals: Ravi Nori: Looks good to me, but someone else must approve Alexander Wels: Looks good to me, approved Yair Zaslavsky: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/28722 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1867577a900e2c7a815d443b771e2576bd8aea2 Gerrit-PatchSet: 10 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Lior Vernia <lvernia(a)redhat.com> Gerrit-Reviewer: Ondřej Macháček <machacek.ondra(a)gmail.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Ravi Nori <rnori(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[master]: core: changed a bit addCanDoActionMessage
by yzaslavs＠redhat.com 18 Jul '14

18 Jul '14

Yair Zaslavsky has submitted this change and it was merged. Change subject: core: changed a bit addCanDoActionMessage ...................................................................... core: changed a bit addCanDoActionMessage Changed the version that accepts a VdcBllMessage to use the version that accepts a string Change-Id: Idc5c3b05db66179a49f5f482a06e9e9b088da85f signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Martin Peřina: Looks good to me, but someone else must approve Ravi Nori: Looks good to me, but someone else must approve Yair Zaslavsky: Verified Oved Ourfali: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/26603 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc5c3b05db66179a49f5f482a06e9e9b088da85f Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Ravi Nori <rnori(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