Tal Nisan has uploaded a new change for review.
Change subject: core: Fix type in ActionType
......................................................................
core: Fix type in ActionType
ActionType.MANIPUTLATE_HOST renamed to ActionType.MANIPULATE_HOST
Change-Id: Iaa3e7c526fe3b05c1e7dbe9c01377b3218d2d74c
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.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
5 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/24136/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java
index ce8da34..2a94b50 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java
@@ -104,7 +104,7 @@
List<PermissionSubject> permissions = new
ArrayList<PermissionSubject>();
permissions.add(new
PermissionSubject(getParameters().getPreferredSPMId(),
VdcObjectType.VDS,
- ActionGroup.MANIPUTLATE_HOST));
+ ActionGroup.MANIPULATE_HOST));
return permissions;
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
index a635343..bc781ea 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
@@ -57,11 +57,11 @@
AddVds(101, ActionGroup.CREATE_HOST, QuotaDependency.NONE),
UpdateVds(102, ActionGroup.EDIT_HOST_CONFIGURATION, false,
QuotaDependency.NONE),
RemoveVds(103, ActionGroup.DELETE_HOST, false, QuotaDependency.NONE),
- RestartVds(104, ActionGroup.MANIPUTLATE_HOST, QuotaDependency.NONE),
+ RestartVds(104, ActionGroup.MANIPULATE_HOST, QuotaDependency.NONE),
VdsNotRespondingTreatment(105, QuotaDependency.NONE),
MaintenanceVds(106, QuotaDependency.NONE),
- MaintenanceNumberOfVdss(107, ActionGroup.MANIPUTLATE_HOST, false,
QuotaDependency.NONE),
- ActivateVds(108, ActionGroup.MANIPUTLATE_HOST, QuotaDependency.NONE),
+ MaintenanceNumberOfVdss(107, ActionGroup.MANIPULATE_HOST, false,
QuotaDependency.NONE),
+ ActivateVds(108, ActionGroup.MANIPULATE_HOST, QuotaDependency.NONE),
InstallVds(109, QuotaDependency.NONE),
ClearNonResponsiveVdsVms(110, QuotaDependency.NONE),
ApproveVds(112, ActionGroup.CREATE_HOST, QuotaDependency.NONE),
@@ -71,13 +71,13 @@
AddVdsSpmId(119, QuotaDependency.NONE),
ForceSelectSPM(120, QuotaDependency.NONE),
// Fencing (including RestartVds above)
- StartVds(121, ActionGroup.MANIPUTLATE_HOST, QuotaDependency.NONE),
- StopVds(122, ActionGroup.MANIPUTLATE_HOST, QuotaDependency.NONE),
+ StartVds(121, ActionGroup.MANIPULATE_HOST, QuotaDependency.NONE),
+ StopVds(122, ActionGroup.MANIPULATE_HOST, QuotaDependency.NONE),
HandleVdsVersion(124, QuotaDependency.NONE),
ChangeVDSCluster(125, ActionGroup.EDIT_HOST_CONFIGURATION, false,
QuotaDependency.NONE),
- RefreshHostCapabilities(126, ActionGroup.MANIPUTLATE_HOST, false,
QuotaDependency.NONE),
+ RefreshHostCapabilities(126, ActionGroup.MANIPULATE_HOST, false,
QuotaDependency.NONE),
SshSoftFencing(127, QuotaDependency.NONE),
- VdsPowerDown(128, ActionGroup.MANIPUTLATE_HOST, QuotaDependency.NONE),
+ VdsPowerDown(128, ActionGroup.MANIPULATE_HOST, QuotaDependency.NONE),
// Network
UpdateNetworkToVdsInterface(149, ActionGroup.CONFIGURE_HOST_NETWORK,
QuotaDependency.NONE),
@@ -227,7 +227,7 @@
AddStoragePoolWithStorages(951, ActionGroup.CREATE_STORAGE_POOL,
QuotaDependency.NONE),
RemoveStoragePool(957, ActionGroup.DELETE_STORAGE_POOL,
QuotaDependency.NONE),
UpdateStoragePool(958, ActionGroup.EDIT_STORAGE_POOL_CONFIGURATION,
QuotaDependency.NONE),
- FenceVdsManualy(959, ActionGroup.MANIPUTLATE_HOST, false,
QuotaDependency.NONE),
+ FenceVdsManualy(959, ActionGroup.MANIPULATE_HOST, false,
QuotaDependency.NONE),
AddExistingFileStorageDomain(960, ActionGroup.CREATE_STORAGE_DOMAIN,
QuotaDependency.NONE),
AddStorageServerConnection(1000, ActionGroup.CREATE_STORAGE_DOMAIN,
QuotaDependency.NONE),
UpdateStorageServerConnection(1001, ActionGroup.CREATE_STORAGE_DOMAIN,
QuotaDependency.NONE),
@@ -322,7 +322,7 @@
AddInternalJob(1850, false, QuotaDependency.NONE),
AddInternalStep(1851, false, QuotaDependency.NONE),
- UpdateMomPolicy(1900, ActionGroup.MANIPUTLATE_HOST, false,
QuotaDependency.NONE),
+ UpdateMomPolicy(1900, ActionGroup.MANIPULATE_HOST, false,
QuotaDependency.NONE),
// Affinity Groups
AddAffinityGroup(1950, ActionGroup.MANIPULATE_AFFINITY_GROUPS, false,
QuotaDependency.NONE),
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 484a593..39cc87c 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
@@ -46,7 +46,7 @@
CREATE_HOST(100, RoleType.ADMIN, VdcObjectType.VDS, true),
EDIT_HOST_CONFIGURATION(101, RoleType.ADMIN, VdcObjectType.VDS, true),
DELETE_HOST(102, RoleType.ADMIN, VdcObjectType.VDS, true),
- MANIPUTLATE_HOST(103, RoleType.ADMIN, VdcObjectType.VDS, true),
+ MANIPULATE_HOST(103, RoleType.ADMIN, VdcObjectType.VDS, true),
CONFIGURE_HOST_NETWORK(104, RoleType.ADMIN, VdcObjectType.VDS, true),
// templates actions groups
CREATE_TEMPLATE(200, RoleType.USER, VdcObjectType.VmTemplate, false,
ApplicationMode.VirtOnly),
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 e5ddfde..e024a61 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
@@ -78,7 +78,7 @@
return PermitType.EDIT_HOST_CONFIGURATION;
case DELETE_HOST:
return PermitType.DELETE_HOST;
- case MANIPUTLATE_HOST:
+ case MANIPULATE_HOST:
return PermitType.MANIPUTLATE_HOST;
case CONFIGURE_HOST_NETWORK:
return PermitType.CONFIGURE_HOST_NETWORK;
@@ -235,7 +235,7 @@
case DELETE_HOST:
return ActionGroup.DELETE_HOST;
case MANIPUTLATE_HOST:
- return ActionGroup.MANIPUTLATE_HOST;
+ return ActionGroup.MANIPULATE_HOST;
case CONFIGURE_HOST_NETWORK:
return ActionGroup.CONFIGURE_HOST_NETWORK;
case CREATE_TEMPLATE:
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 76c3482..70e7cd3 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
@@ -197,7 +197,7 @@
getConstants().allowToRemoveExistingHostFromTheClusterRoleTreeTooltip()),
new RoleNode(ActionGroup.EDIT_HOST_CONFIGURATION,
getConstants().allowToEditHostPropertiesRoleTreeTooltip()),
- new RoleNode(ActionGroup.MANIPUTLATE_HOST,
+ new RoleNode(ActionGroup.MANIPULATE_HOST,
getConstants().allowToChangeHostStatusRoleTreeTooltip()),
new RoleNode(ActionGroup.CONFIGURE_HOST_NETWORK,
getConstants().allowToConfigureHostsNetworkPhysicalInterfacesRoleTreeTooltip())
}));
--
To view, visit http://gerrit.ovirt.org/24136
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa3e7c526fe3b05c1e7dbe9c01377b3218d2d74c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
