Moti Asayag has uploaded a new change for review. Change subject: engine: Maintain NetworkUser role id for VnicProfileUser ......................................................................
engine: Maintain NetworkUser role id for VnicProfileUser The role id of the NetworkUser should be preserved for VnicProfileUser so the same resource could be reachable via the api. Change-Id: I2ebd6c4da455696f82fa8f53cfcb35d8c97a479f Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PredefinedRoles.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java M packaging/dbscripts/upgrade/03_03_0710_add_profile_to_network_interface.sql 3 files changed, 27 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/18003/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PredefinedRoles.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PredefinedRoles.java index 18dd7d9..b411274 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PredefinedRoles.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PredefinedRoles.java @@ -21,7 +21,7 @@ VM_CREATOR(new Guid("DEF0000A-0000-0000-0000-DEF00000000D")), TEMPLATE_CREATOR(new Guid("DEF0000A-0000-0000-0000-DEF00000000E")), TEMPLATE_OWNER(new Guid("DEF0000A-0000-0000-0000-DEF00000000F")), - VNIC_PROFILE_USER(new Guid("DEF00020-0000-0000-0000-DEF000000010")); + VNIC_PROFILE_USER(new Guid("DEF0000A-0000-0000-0000-DEF000000010")); private Guid id; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java index 905657f..788af26 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java @@ -13,7 +13,7 @@ userTemplateBasedVM(new Guid("def00009-0000-0000-0000-def000000009")), //$NON-NLS-1$ quotaConsumer(new Guid("def0000a-0000-0000-0000-def00000000a")), //$NON-NLS-1$ dataCenterAdmin(new Guid("def00002-0000-0000-0000-def000000002")), //$NON-NLS-1$ - vnicProfileUser(new Guid("def00020-0000-0000-0000-def000000010")), //$NON-NLS-1$ + vnicProfileUser(new Guid("DEF0000A-0000-0000-0000-DEF000000010")), //$NON-NLS-1$ // ad_groups everyone(new Guid("eee00000-0000-0000-0000-123456789eee")); //$NON-NLS-1$ diff --git a/packaging/dbscripts/upgrade/03_03_0710_add_profile_to_network_interface.sql b/packaging/dbscripts/upgrade/03_03_0710_add_profile_to_network_interface.sql index 58a09ef..2dd0c21 100644 --- a/packaging/dbscripts/upgrade/03_03_0710_add_profile_to_network_interface.sql +++ b/packaging/dbscripts/upgrade/03_03_0710_add_profile_to_network_interface.sql @@ -66,7 +66,8 @@ network.name, network.id, FALSE - FROM network; + FROM network + WHERE network.vm_network IS TRUE; -- create profiles with port_mirroring support for networks with such such VNICs INSERT INTO vnic_profiles(id, name, network_id, port_mirroring) @@ -75,7 +76,8 @@ network.id, TRUE FROM network - WHERE __temp_has_port_mirroring_template_interfaces(network.id) OR __temp_has_port_mirroring_vm_interfaces(network.id); + WHERE network.vm_network IS TRUE + AND (__temp_has_port_mirroring_template_interfaces(network.id) OR __temp_has_port_mirroring_vm_interfaces(network.id)); -- add correct profile to each VM/Template vnic UPDATE vm_interface @@ -228,6 +230,27 @@ DELETE FROM roles_groups WHERE action_group_id = 1200; +------------------------------------------------------ +-- Update VnicProfileUser roleId to NetworkUser roleId +------------------------------------------------------ + ALTER TABLE roles DISABLE TRIGGER ALL; + ALTER TABLE permissions DISABLE TRIGGER ALL; + + UPDATE roles + SET id = v_NETWORK_USER_ID + WHERE id = v_VNIC_PROFILE_USER_ID; + + UPDATE permissions + SET role_id = v_NETWORK_USER_ID + WHERE role_id = v_VNIC_PROFILE_USER_ID; + + UPDATE roles_groups + SET role_id = v_NETWORK_USER_ID + WHERE role_id = v_VNIC_PROFILE_USER_ID; + + ALTER TABLE roles ENABLE TRIGGER ALL; + ALTER TABLE permissions ENABLE TRIGGER ALL; + END; $procedure$ LANGUAGE plpgsql; -- To view, visit http://gerrit.ovirt.org/18003 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ebd6c4da455696f82fa8f53cfcb35d8c97a479f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
