Shubhendu Tripathi has uploaded a new change for review.
Change subject: engine, webadmin: Corrected action and type values
......................................................................
engine, webadmin: Corrected action and type values
Corrected action and type values for gluster volume
snapshot configuration case.
Change-Id: I3fe24a150c49129cba904b4613fdc9146dc96e1f
Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterVolumeSnapshotConfigCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
5 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/41119/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterVolumeSnapshotConfigCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterVolumeSnapshotConfigCommand.java
index d68460b..e07aec3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterVolumeSnapshotConfigCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterVolumeSnapshotConfigCommand.java
@@ -42,6 +42,7 @@
@Override
protected void setActionMessageParameters() {
+
addCanDoActionMessage(VdcBllMessages.VAR__TYPE__GLUSTER_VOLUME_SNAPSHOT_CONFIG);
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__VOLUME_SNAPSHOT_CONFIG_UPDATE);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
index 2251393..bc50b79 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
@@ -54,6 +54,7 @@
VAR__TYPE__GLUSTER_GEOREP_SESSION,
VAR__TYPE__GLUSTER_GEOREP_CONFIG,
VAR__TYPE__GLUSTER_VOLUME_SNAPSHOT,
+ VAR__TYPE__GLUSTER_VOLUME_SNAPSHOT_CONFIG,
VAR__TYPE__STORAGE_DEVICE,
VAR__TYPE__GEOREP_MOUNT_BROKER,
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index 6657bde..0343fcf 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -379,7 +379,7 @@
VAR__ACTION__FORCE_SELECT=$action force select
VAR__ACTION__EXTEND_IMAGE_SIZE=$action extend
VAR__ACTION__UPDATE_VM_VERSION=$action update version for
-VAR__ACTION__VOLUME_SNAPSHOT_CONFIG_UPDATE=$action gluster volume snapshot
config update
+VAR__ACTION__VOLUME_SNAPSHOT_CONFIG_UPDATE=$action update
VAR__HOST_STATUS__UP=$hostStatus Up
VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL=$hostStatus Up,
Maintenance or Non operational
@@ -1044,6 +1044,7 @@
VAR__TYPE__GLUSTER_SERVICE=$type Service
VAR__TYPE__GLUSTER_GEOREP_SESSION=$type Geo-replication session
VAR__TYPE__GLUSTER_VOLUME_SNAPSHOT=$type Gluster Volume Snapshot
+VAR__TYPE__GLUSTER_VOLUME_SNAPSHOT_CONFIG=$type Gluster Volume Snapshot config
VAR__TYPE__STORAGE_DEVICE=$type Storage Device
VALIDATION.GLUSTER.VOLUME.ID.NOT_NULL=Volume ID is required.
VALIDATION.GLUSTER.VOLUME.CLUSTER_ID.NOT_NULL=Cluster ID is required.
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index ca0ea57..89b93b6 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -874,6 +874,9 @@
@DefaultStringValue("$type Gluster Volume Snapshot")
String VAR__TYPE__GLUSTER_VOLUME_SNAPSHOT();
+ @DefaultStringValue("$type Gluster Volume Snapshot config")
+ String VAR__TYPE__GLUSTER_VOLUME_SNAPSHOT_CONFIG();
+
@DefaultStringValue("$action run")
String VAR__ACTION__RUN();
@@ -1048,7 +1051,7 @@
@DefaultStringValue("$action update version for")
String VAR__ACTION__UPDATE_VM_VERSION();
- @DefaultStringValue("$action gluster volume snapshot config update")
+ @DefaultStringValue("$action update")
String VAR__ACTION__VOLUME_SNAPSHOT_CONFIG_UPDATE();
@DefaultStringValue("$hostStatus Up")
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index 3bbfd4c..88c968d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -318,6 +318,7 @@
VAR__TYPE__GLUSTER_SERVICE=$type Service
VAR__TYPE__GLUSTER_GEOREP_SESSION=$type Geo-replication session
VAR__TYPE__GLUSTER_VOLUME_SNAPSHOT=$type Gluster Volume Snapshot
+VAR__TYPE__GLUSTER_VOLUME_SNAPSHOT_CONFIG=$type Gluster Volume Snapshot config
VAR__TYPE__NETWORK_QOS=$type Network QoS
VAR__TYPE__QOS=$type QoS
VAR__TYPE__SPM=$type SPM
@@ -382,7 +383,7 @@
VAR__ACTION__FORCE_SELECT=$action force select
VAR__ACTION__EXTEND_IMAGE_SIZE=$action extend
VAR__ACTION__UPDATE_VM_VERSION=$action update version for
-VAR__ACTION__VOLUME_SNAPSHOT_CONFIG_UPDATE=$action gluster volume snapshot
config update
+VAR__ACTION__VOLUME_SNAPSHOT_CONFIG_UPDATE=$action update
VAR__HOST_STATUS__UP=$hostStatus Up
VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL=$hostStatus Up,
Maintenance or Non operational
--
To view, visit https://gerrit.ovirt.org/41119
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fe24a150c49129cba904b4613fdc9146dc96e1f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
