diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2016-07-27 16:28:44 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2016-08-24 03:17:30 -0700 |
| commit | 5d833c89aacc747d0bc654b4ab947c6bf59366d0 (patch) | |
| tree | d066b94f06c4865cc2d9483a49885c0f0d79b171 /tests | |
| parent | 106a107ec5c8ecc48c3e048a9b8ad9ac809e278d (diff) | |
snapshot: Display number of snapshots in volume info
Backport of http://review.gluster.org/#/c/15029/
Display number of snapshots in a volume in volume info
output. This number gets modified, with create, delete,
and restore operations.
> Reviewed-on: http://review.gluster.org/15029
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
(cherry picked from commit 1df4a89de17e44c8c1f9b4794a7b8c2741f2bc2e)
Change-Id: Ic9b7c2b6950980f8ce75ca362998c097ea7c863d
BUG: 1369328
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/15288
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic/volume-snapshot.t | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/basic/volume-snapshot.t b/tests/basic/volume-snapshot.t index 794ab4944b0..dd938b4064a 100755 --- a/tests/basic/volume-snapshot.t +++ b/tests/basic/volume-snapshot.t @@ -104,6 +104,11 @@ create_snapshots EXPECT 'Started' snapshot_status ${V0}_snap; EXPECT 'Started' snapshot_status ${V1}_snap; +EXPECT '1' volinfo_field $V0 'Snapshot Count'; +EXPECT '1' volinfo_field $V1 'Snapshot Count'; +EXPECT "1" get-cmd-field-xml "volume info $V0" "snapshotCount" +EXPECT "1" get-cmd-field-xml "volume info $V1" "snapshotCount" + deactivate_snapshots EXPECT 'Stopped' snapshot_status ${V0}_snap; @@ -132,10 +137,20 @@ create_snapshots_with_timestamp; new_name1=`$CLI_1 snapshot list ${V0} | grep ${V0}_snap1`; new_name2=`$CLI_1 snapshot list ${V1} | grep ${V1}_snap1`; +EXPECT '2' volinfo_field $V0 'Snapshot Count'; +EXPECT '2' volinfo_field $V1 'Snapshot Count'; +EXPECT "2" get-cmd-field-xml "volume info $V0" "snapshotCount" +EXPECT "2" get-cmd-field-xml "volume info $V1" "snapshotCount" + EXPECT_NOT "{V0}_snap1" echo $new_name1; EXPECT_NOT "{V1}_snap1" echo $new_name1; delete_snapshots $new_name1 $new_name2; +EXPECT '1' volinfo_field $V0 'Snapshot Count'; +EXPECT '1' volinfo_field $V1 'Snapshot Count'; +EXPECT "1" get-cmd-field-xml "volume info $V0" "snapshotCount" +EXPECT "1" get-cmd-field-xml "volume info $V1" "snapshotCount" + #Clean up stop_force_volumes 2 EXPECT 'Stopped' volinfo_field $V0 'Status'; @@ -145,6 +160,11 @@ restore_snapshots TEST ! snapshot_exists 1 ${V0}_snap TEST ! snapshot_exists 1 ${V1}_snap +EXPECT '0' volinfo_field $V0 'Snapshot Count'; +EXPECT '0' volinfo_field $V1 'Snapshot Count'; +EXPECT "0" get-cmd-field-xml "volume info $V0" "snapshotCount" +EXPECT "0" get-cmd-field-xml "volume info $V1" "snapshotCount" + delete_volumes 2 EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "N" volume_exists $V0 EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "N" volume_exists $V1 |