Gilad Chaplik has uploaded a new change for review.
Change subject: engine: cpu profiles MLA support
......................................................................
engine: cpu profiles MLA support
Introducing cpu profiles Action Groups and adding to relevant roles.
Change-Id: I2fdc19a390566bdbe70701a8a25f69df3f361535
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
A packaging/dbscripts/upgrade/03_06_0250_add_cpu_profile_action_groups.sql
7 files changed, 98 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/31624/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java
index e55dad2..9eb2428 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java
@@ -139,6 +139,11 @@
CREATE_STORAGE_DISK_PROFILE(1561, RoleType.ADMIN, true,
ApplicationMode.VirtOnly),
DELETE_STORAGE_DISK_PROFILE(1562, RoleType.ADMIN, true,
ApplicationMode.VirtOnly),
+ // cpu profiles
+ CONFIGURE_CPU_PROFILE(1563, RoleType.ADMIN, true,
ApplicationMode.VirtOnly),
+ CREATE_CPU_PROFILE(1564, RoleType.ADMIN, true, ApplicationMode.VirtOnly),
+ DELETE_CPU_PROFILE(1565, RoleType.ADMIN, true, ApplicationMode.VirtOnly),
+
// MAC pool actions groups
CREATE_MAC_POOL(1660, RoleType.ADMIN, true, ApplicationMode.VirtOnly),
EDIT_MAC_POOL(1661, RoleType.ADMIN, true, ApplicationMode.VirtOnly),
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java
index 6ea1c7e..b5252c9 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java
@@ -128,7 +128,12 @@
// disk profile
CONFIGURE_STORAGE_DISK_PROFILE,
CREATE_STORAGE_DISK_PROFILE,
- DELETE_STORAGE_DISK_PROFILE;
+ DELETE_STORAGE_DISK_PROFILE,
+
+ // cpu profile
+ CONFIGURE_CPU_PROFILE,
+ CREATE_CPU_PROFILE,
+ DELETE_CPU_PROFILE;
private final ActionGroup actionGroup;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
index 85653f6..859650d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
@@ -229,17 +229,27 @@
}
protected static RoleNode createClusterRoleTree() {
- return new RoleNode(getConstants().clusterRoleTree(), new
RoleNode(getConstants().configureClusterRoleTree(),
- new RoleNode[] {
- new RoleNode(ActionGroup.CREATE_CLUSTER,
-
getConstants().allowToCreateNewClusterRoleTreeTooltip()),
- new RoleNode(ActionGroup.DELETE_CLUSTER,
getConstants().allowToRemoveClusterRoleTreeTooltip()),
- new RoleNode(ActionGroup.EDIT_CLUSTER_CONFIGURATION,
-
getConstants().allowToEditClusterPropertiesRoleTreeTooltip()),
- new RoleNode(ActionGroup.CONFIGURE_CLUSTER_NETWORK,
-
getConstants().allowToEditLogicalNetworksForTheClusterRoleTreeTooltip()),
- new RoleNode(ActionGroup.MANIPULATE_AFFINITY_GROUPS,
-
getConstants().allowToManipulateAffinityGroupsForClusterRoleTreeTooltip()) }));
+ return new RoleNode(getConstants().clusterRoleTree(), new RoleNode[] {
+ new RoleNode(getConstants().configureClusterRoleTree(),
+ new RoleNode[] {
+ new RoleNode(ActionGroup.CREATE_CLUSTER,
+
getConstants().allowToCreateNewClusterRoleTreeTooltip()),
+ new RoleNode(ActionGroup.DELETE_CLUSTER,
+
getConstants().allowToRemoveClusterRoleTreeTooltip()),
+ new
RoleNode(ActionGroup.EDIT_CLUSTER_CONFIGURATION,
+
getConstants().allowToEditClusterPropertiesRoleTreeTooltip()),
+ new
RoleNode(ActionGroup.CONFIGURE_CLUSTER_NETWORK,
+
getConstants().allowToEditLogicalNetworksForTheClusterRoleTreeTooltip()),
+ new
RoleNode(ActionGroup.MANIPULATE_AFFINITY_GROUPS,
+
getConstants().allowToManipulateAffinityGroupsForClusterRoleTreeTooltip()) }),
+ new RoleNode(getConstants().configureCpuProfileRoleTree(), new
RoleNode[] {
+ new RoleNode(ActionGroup.CREATE_CPU_PROFILE,
+
getConstants().allowToCreateCpuProfileRoleTreeTooltip()),
+ new RoleNode(ActionGroup.DELETE_CPU_PROFILE,
+
getConstants().allowToDeleteCpuProfileRoleTreeTooltip()),
+ new RoleNode(ActionGroup.CONFIGURE_CPU_PROFILE,
+
getConstants().allowToUpdateCpuProfileRoleTreeTooltip()) }) });
+
}
protected static RoleNode createStorageDomainRoleTree() {
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
index 8809293..7622a83 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
@@ -210,6 +210,12 @@
String ActionGroup___DELETE_STORAGE_DISK_PROFILE();
+ String ActionGroup___CONFIGURE_CPU_PROFILE();
+
+ String ActionGroup___CREATE_CPU_PROFILE();
+
+ String ActionGroup___DELETE_CPU_PROFILE();
+
String EventNotificationEntity___Host();
String EventNotificationEntity___VdsGroup();
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
index d195807..05b6c1d 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
@@ -1478,6 +1478,18 @@
@DefaultStringValue("Allow to update Disk Profile")
String allowToUpdateDiskProfileRoleTreeTooltip();
+ @DefaultStringValue("Configure CPU Profile")
+ String configureCpuProfileRoleTree();
+
+ @DefaultStringValue("Allow to create CPU Profile")
+ String allowToCreateCpuProfileRoleTreeTooltip();
+
+ @DefaultStringValue("Allow to delete CPU Profile")
+ String allowToDeleteCpuProfileRoleTreeTooltip();
+
+ @DefaultStringValue("Allow to update CPU Profile")
+ String allowToUpdateCpuProfileRoleTreeTooltip();
+
@DefaultStringValue("Cluster")
String clusterRoleTree();
diff --git
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
index 544a637..6aad859 100644
---
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
+++
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
@@ -105,6 +105,9 @@
ActionGroup___CONFIGURE_STORAGE_DISK_PROFILE=Manipulate Disk Profiles
ActionGroup___CREATE_STORAGE_DISK_PROFILE=Create Disk Profiles
ActionGroup___DELETE_STORAGE_DISK_PROFILE=Delete Disk Profiles
+ActionGroup___CONFIGURE_CPU_PROFILE=Manipulate CPU Profiles
+ActionGroup___CREATE_CPU_PROFILE=Create CPU Profiles
+ActionGroup___DELETE_CPU_PROFILE=Delete CPU Profiles
EventNotificationEntity___Host=General Host Events:
EventNotificationEntity___VdsGroup=Cluster Events:
EventNotificationEntity___VirtHost=Virt Host Events:
diff --git
a/packaging/dbscripts/upgrade/03_06_0250_add_cpu_profile_action_groups.sql
b/packaging/dbscripts/upgrade/03_06_0250_add_cpu_profile_action_groups.sql
new file mode 100644
index 0000000..9ace784
--- /dev/null
+++ b/packaging/dbscripts/upgrade/03_06_0250_add_cpu_profile_action_groups.sql
@@ -0,0 +1,45 @@
+-- add permissions to cpu profile (according to existing permissions on
cluster).
+
+------------------------------------------------
+--- Update existing roles with new Action Groups
+------------------------------------------------
+-- Add ActionGroup 1563 (CONFIGURE_CPU_PROFILE) to any role which contains
EDIT_CLUSTER_CONFIGURATION(401)
+INSERT INTO roles_groups (role_id, action_group_id)
+SELECT DISTINCT role_id, 1563
+FROM roles_groups a
+WHERE NOT EXISTS (SELECT 1
+ FROM roles_groups b
+ WHERE b.role_id = a.role_id
+ AND b.action_group_id = 1563)
+ AND EXISTS (SELECT 1
+ FROM roles_groups b
+ WHERE b.role_id = a.role_id
+ AND (b.action_group_id = 401));
+
+-- Add ActionGroup 1564 (CREATE_CPU_PROFILE) to any role which contains
ActionGroup CREATE_CLUSTER(400)
+INSERT INTO roles_groups (role_id, action_group_id)
+SELECT DISTINCT role_id, 1564
+FROM roles_groups a
+WHERE NOT EXISTS (SELECT 1
+ FROM roles_groups b
+ WHERE b.role_id = a.role_id
+ AND b.action_group_id = 1564)
+ AND EXISTS (SELECT 1
+ FROM roles_groups b
+ WHERE b.role_id = a.role_id
+ AND b.action_group_id = 400);
+
+-- Add ActionGroup 1565 (DELETE_CPU_PROFILE) to any role which contains
ActionGroup DELETE_CLUSTER(402)
+INSERT INTO roles_groups (role_id, action_group_id)
+SELECT DISTINCT role_id, 1565
+FROM roles_groups a
+WHERE NOT EXISTS (SELECT 1
+ FROM roles_groups b
+ WHERE b.role_id = a.role_id
+ AND b.action_group_id = 1565)
+ AND EXISTS (SELECT 1
+ FROM roles_groups b
+ WHERE b.role_id = a.role_id
+ AND b.action_group_id = 402);
+
+
--
To view, visit http://gerrit.ovirt.org/31624
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fdc19a390566bdbe70701a8a25f69df3f361535
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
