Moti Asayag has uploaded a new change for review.
Change subject: engine: Drop PORT_MIRRORING action group
......................................................................
engine: Drop PORT_MIRRORING action group
Since the permissions for using port mirroring on
a specific networks are replaced by using a vnic
profile configured for port mirroring, there is no
more use of the PORT_MIRRORING action group and it
should be removed.
Change-Id: I3111db10372deaa4a244b4d253b72326edd56fe8
Signed-off-by: Moti Asayag <masa...@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
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.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/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
6 files changed, 1 insertion(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/17741/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 cd32a0a..203d645 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
@@ -104,9 +104,6 @@
DELETE_DISK(1104, RoleType.USER, VdcObjectType.Disk, true,
ApplicationMode.VirtOnly),
CONFIGURE_SCSI_GENERIC_IO(1105, RoleType.ADMIN, VdcObjectType.Disk, true,
ApplicationMode.VirtOnly),
- // Network
- PORT_MIRRORING(1200, RoleType.ADMIN, VdcObjectType.Network, true,
ApplicationMode.VirtOnly),
-
// VNIC Profiles
CONFIGURE_NETWORK_VNIC_PROFILE(1203, RoleType.ADMIN,
VdcObjectType.VnicProfile, true, ApplicationMode.VirtOnly),
CREATE_NETWORK_VNIC_PROFILE(1204, RoleType.ADMIN,
VdcObjectType.VnicProfile, 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 724ce43..dad1780 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
@@ -97,7 +97,6 @@
CONFIGURE_SCSI_GENERIC_IO,
// Vm Interface action groups
- PORT_MIRRORING,
CONFIGURE_NETWORK_VNIC_PROFILE,
CREATE_NETWORK_VNIC_PROFILE,
DELETE_NETWORK_VNIC_PROFILE,
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java
index b2e2cdb..1b6eff4 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java
@@ -160,8 +160,6 @@
return PermitType.CONFIGURE_DISK_STORAGE;
case DELETE_DISK:
return PermitType.DELETE_DISK;
- case PORT_MIRRORING:
- return PermitType.PORT_MIRRORING;
case CONFIGURE_NETWORK_VNIC_PROFILE:
return PermitType.CONFIGURE_NETWORK_VNIC_PROFILE;
case CREATE_NETWORK_VNIC_PROFILE:
@@ -298,8 +296,6 @@
return ActionGroup.CONFIGURE_DISK_STORAGE;
case DELETE_DISK:
return ActionGroup.DELETE_DISK;
- case PORT_MIRRORING:
- return ActionGroup.PORT_MIRRORING;
case CONFIGURE_NETWORK_VNIC_PROFILE:
return ActionGroup.CONFIGURE_NETWORK_VNIC_PROFILE;
case CREATE_NETWORK_VNIC_PROFILE:
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 0205596..9d1a7d3 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
@@ -188,18 +188,7 @@
new
RoleNode(ActionGroup.CONFIGURE_TEMPLATE_NETWORK,
ConstantsManager.getInstance()
.getConstants()
-
.allowToConfigureTemlateNetworkRoleTreeTooltip()) }),
- new
RoleNode(ConstantsManager.getInstance()
- .getConstants()
-
.administrationOperationsRoleTree(),
-
ConstantsManager.getInstance()
- .getConstants()
-
.notePermissionsContainingTheseOperationsShouldAssociateNetworkOrEqualRoleTreeTooltip(),
- new RoleNode[] {
- new
RoleNode(ActionGroup.PORT_MIRRORING,
-
ConstantsManager.getInstance()
-
.getConstants()
-
.allowVmNetworkPortMirroringRoleTreeTooltip()) }) }),
+
.allowToConfigureTemlateNetworkRoleTreeTooltip()) }) }),
new
RoleNode(ConstantsManager.getInstance().getConstants().storageDomainRoleTree(),
new
RoleNode(ConstantsManager.getInstance()
.getConstants()
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 6ef7ef2..107b6e2 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
@@ -152,8 +152,6 @@
String ActionGroup___CONFIGURE_SCSI_GENERIC_IO();
- String ActionGroup___PORT_MIRRORING();
-
String ActionGroup___CONFIGURE_DISK_STORAGE();
String ActionGroup___DELETE_DISK();
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 4aedc40..103a799 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
@@ -80,7 +80,6 @@
ActionGroup___CREATE_NETWORK_VNIC_PROFILE=Create
ActionGroup___DELETE_NETWORK_VNIC_PROFILE=Delete
ActionGroup___CONFIGURE_SCSI_GENERIC_IO=Manipulate SCSI I/O Privileges
-ActionGroup___PORT_MIRRORING=Port Mirroring
ActionGroup___MANIPULATE_GLUSTER_HOOK=Manipulate Gluster Hook
ActionGroup___MANIPULATE_GLUSTER_SERVICE=Manipulate Service
EventNotificationEntity___Host=Host Events:
--
To view, visit http://gerrit.ovirt.org/17741
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3111db10372deaa4a244b4d253b72326edd56fe8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
