From 62dbefde4bc5c8d9dcfb10f3be5d349db341bb30 Mon Sep 17 00:00:00 2001 From: N Balachandran Date: Mon, 23 Oct 2017 12:42:32 +0530 Subject: tests: Update tier CLI in .t files Update .t tier tests to use the new tier CLI. Change-Id: I0e7f1769071108d8266fc86378c4466bcaf96e7d BUG: 1505253 Signed-off-by: N Balachandran --- .../glusterd/bug-1303028-Rebalance-glusterd-rpc-connection-issue.t | 2 +- tests/bugs/quota/bug-1288474.t | 4 ++-- tests/bugs/replicate/bug-1290965-detect-bitrotten-objects.t | 2 +- tests/bugs/snapshot/bug-1227646.t | 2 +- tests/bugs/snapshot/bug-1279327.t | 2 +- tests/bugs/tier/bug-1205545-CTR-and-trash-integration.t | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/bugs') diff --git a/tests/bugs/glusterd/bug-1303028-Rebalance-glusterd-rpc-connection-issue.t b/tests/bugs/glusterd/bug-1303028-Rebalance-glusterd-rpc-connection-issue.t index 00f20c1ff78..3b62a4547b5 100644 --- a/tests/bugs/glusterd/bug-1303028-Rebalance-glusterd-rpc-connection-issue.t +++ b/tests/bugs/glusterd/bug-1303028-Rebalance-glusterd-rpc-connection-issue.t @@ -15,7 +15,7 @@ function create_dist_tier_vol () { TEST $CLI volume set $V0 performance.quick-read off TEST $CLI volume set $V0 performance.io-cache off TEST $CLI volume start $V0 - TEST $CLI volume attach-tier $V0 $H0:$B0/hot/${V0}{1..2} + TEST $CLI volume tier $V0 attach $H0:$B0/hot/${V0}{1..2} TEST $CLI volume set $V0 cluster.tier-mode test } diff --git a/tests/bugs/quota/bug-1288474.t b/tests/bugs/quota/bug-1288474.t index 57a66197cde..b8f4ba38d4d 100755 --- a/tests/bugs/quota/bug-1288474.t +++ b/tests/bugs/quota/bug-1288474.t @@ -32,9 +32,9 @@ TEST $CLI volume quota $V0 limit-usage / 10MB EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "10.0MB" quota_list_field "/" 5 #check quota list after detach tier -TEST $CLI volume detach-tier $V0 start +TEST $CLI volume tier $V0 detach start sleep 1 -TEST $CLI volume detach-tier $V0 force +TEST $CLI volume tier $V0 detach force EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "10.0MB" quota_list_field "/" 5 diff --git a/tests/bugs/replicate/bug-1290965-detect-bitrotten-objects.t b/tests/bugs/replicate/bug-1290965-detect-bitrotten-objects.t index 1828e6f3493..9863834dbb5 100644 --- a/tests/bugs/replicate/bug-1290965-detect-bitrotten-objects.t +++ b/tests/bugs/replicate/bug-1290965-detect-bitrotten-objects.t @@ -14,7 +14,7 @@ TEST $CLI volume set $V0 metadata-self-heal off TEST $CLI volume set $V0 data-self-heal off TEST $CLI volume set $V0 performance.stat-prefetch off TEST $CLI volume start $V0 -TEST $CLI volume attach-tier $V0 replica 2 $H0:$B0/brick{2,3} +TEST $CLI volume tier $V0 attach replica 2 $H0:$B0/brick{2,3} TEST $CLI volume bitrot $V0 enable EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_bitd_count TEST $CLI volume bitrot $V0 scrub-frequency hourly diff --git a/tests/bugs/snapshot/bug-1227646.t b/tests/bugs/snapshot/bug-1227646.t index 643d814e2ee..a16a8c270da 100644 --- a/tests/bugs/snapshot/bug-1227646.t +++ b/tests/bugs/snapshot/bug-1227646.t @@ -20,7 +20,7 @@ TEST $CLI snapshot create snap1 $V0 no-timestamp; TEST $CLI volume stop $V0 TEST $CLI snapshot restore snap1; TEST $CLI volume start $V0 -TEST $CLI volume attach-tier $V0 $H0:$L1 $H0:$L2 +TEST $CLI volume tier $V0 attach $H0:$L1 $H0:$L2 TEST pkill gluster TEST glusterd diff --git a/tests/bugs/snapshot/bug-1279327.t b/tests/bugs/snapshot/bug-1279327.t index fd5fec24471..de1b3885a1c 100644 --- a/tests/bugs/snapshot/bug-1279327.t +++ b/tests/bugs/snapshot/bug-1279327.t @@ -15,7 +15,7 @@ TEST setup_lvm 3 TEST $CLI volume create $V0 $H0:$L1 TEST $CLI volume start $V0 TEST $CLI volume quota $V0 enable -TEST $CLI volume attach-tier $V0 replica 2 $H0:$L2 $H0:$L3 +TEST $CLI volume tier $V0 attach replica 2 $H0:$L2 $H0:$L3 TEST $CLI snapshot create snap1 $V0 no-timestamp TEST $CLI snapshot activate snap1 diff --git a/tests/bugs/tier/bug-1205545-CTR-and-trash-integration.t b/tests/bugs/tier/bug-1205545-CTR-and-trash-integration.t index 752c517adc3..b2d382a2ce5 100644 --- a/tests/bugs/tier/bug-1205545-CTR-and-trash-integration.t +++ b/tests/bugs/tier/bug-1205545-CTR-and-trash-integration.t @@ -16,7 +16,7 @@ TEST pidof glusterd # Set-up tier cluster [3-4] TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0..$LAST_BRICK} TEST $CLI volume start $V0 -TEST $CLI volume attach-tier $V0 replica 2 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST +TEST $CLI volume tier $V0 attach replica 2 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST # Start and mount the volume after enabling CTR and trash [5-8] TEST $CLI volume set $V0 features.ctr-enabled on -- cgit