From 62dbefde4bc5c8d9dcfb10f3be5d349db341bb30 Mon Sep 17 00:00:00 2001
From: N Balachandran <nbalacha@redhat.com>
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 <nbalacha@redhat.com>
---
 .../tier/bug-1214222-directories_missing_after_attach_tier.t      | 6 +++---
 tests/basic/tier/ctr-rename-overwrite.t                           | 2 +-
 tests/basic/tier/file_with_spaces.t                               | 2 +-
 tests/basic/tier/fops-during-migration-pause.t                    | 2 +-
 tests/basic/tier/fops-during-migration.t                          | 2 +-
 tests/basic/tier/frequency-counters.t                             | 2 +-
 tests/basic/tier/legacy-many.t                                    | 2 +-
 tests/basic/tier/locked_file_migration.t                          | 2 +-
 tests/basic/tier/readdir-during-migration.t                       | 2 +-
 tests/basic/tier/record-metadata-heat.t                           | 2 +-
 tests/basic/tier/tier-heald.t                                     | 8 ++++----
 tests/basic/tier/tier-snapshot.t                                  | 2 +-
 tests/basic/tier/tier_lookup_heal.t                               | 2 +-
 tests/basic/tier/tierd_check.t                                    | 2 +-
 tests/basic/tier/unlink-during-migration.t                        | 2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'tests/basic/tier')

diff --git a/tests/basic/tier/bug-1214222-directories_missing_after_attach_tier.t b/tests/basic/tier/bug-1214222-directories_missing_after_attach_tier.t
index 7ab8ac3e8f2..f9166d7d0e2 100755
--- a/tests/basic/tier/bug-1214222-directories_missing_after_attach_tier.t
+++ b/tests/basic/tier/bug-1214222-directories_missing_after_attach_tier.t
@@ -33,7 +33,7 @@ TEST [ -d d1 ]
 TEST touch file1
 TEST [ -e file1 ]
 
-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
 TEST $CLI volume set $V0 features.ctr-enabled on
 
 #check whether the directory's and files are present on mount or not.
@@ -48,9 +48,9 @@ tier_status ()
 	$CLI volume tier $V0 detach status | grep progress | wc -l
 }
 
-TEST $CLI volume detach-tier $V0 start
+TEST $CLI volume tier $V0 detach start
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" tier_status
-TEST $CLI volume detach-tier $V0 commit
+TEST $CLI volume tier $V0 detach commit
 
 EXPECT "0" confirm_tier_removed ${V0}${CACHE_BRICK_FIRST}
 
diff --git a/tests/basic/tier/ctr-rename-overwrite.t b/tests/basic/tier/ctr-rename-overwrite.t
index 8bccd3b3489..73ee7581338 100755
--- a/tests/basic/tier/ctr-rename-overwrite.t
+++ b/tests/basic/tier/ctr-rename-overwrite.t
@@ -20,7 +20,7 @@ TEST pidof glusterd
 # Set-up tier cluster
 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
 
 TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
 TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
diff --git a/tests/basic/tier/file_with_spaces.t b/tests/basic/tier/file_with_spaces.t
index bd99e71ffe5..919b900c730 100755
--- a/tests/basic/tier/file_with_spaces.t
+++ b/tests/basic/tier/file_with_spaces.t
@@ -23,7 +23,7 @@ function create_dist_tier_vol () {
         TEST $CLI volume set $V0 performance.io-cache off
         TEST $CLI volume set $V0 features.ctr-enabled on
         TEST $CLI volume start $V0
-        TEST $CLI volume attach-tier $V0 $H0:$B0/hot/${V0}{0..$1}
+        TEST $CLI volume tier $V0 attach $H0:$B0/hot/${V0}{0..$1}
         TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
         TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
         TEST $CLI volume set $V0 cluster.read-freq-threshold 0
diff --git a/tests/basic/tier/fops-during-migration-pause.t b/tests/basic/tier/fops-during-migration-pause.t
index 10bd3f4667a..46fc6e445a5 100755
--- a/tests/basic/tier/fops-during-migration-pause.t
+++ b/tests/basic/tier/fops-during-migration-pause.t
@@ -32,7 +32,7 @@ function create_dist_tier_vol () {
         TEST $CLI volume set $V0 performance.io-cache off
         TEST $CLI volume set $V0 features.ctr-enabled on
         TEST $CLI volume start $V0
-        TEST $CLI volume attach-tier $V0 $H0:$B0/hot/${V0}{0..$1}
+        TEST $CLI volume tier $V0 attach $H0:$B0/hot/${V0}{0..$1}
         TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
         TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
         TEST $CLI volume set $V0 cluster.read-freq-threshold 0
diff --git a/tests/basic/tier/fops-during-migration.t b/tests/basic/tier/fops-during-migration.t
index cd3109f0888..c85b4e337cc 100755
--- a/tests/basic/tier/fops-during-migration.t
+++ b/tests/basic/tier/fops-during-migration.t
@@ -23,7 +23,7 @@ function create_dist_tier_vol () {
         TEST $CLI volume set $V0 performance.io-cache off
         TEST $CLI volume set $V0 features.ctr-enabled on
         TEST $CLI volume start $V0
-        TEST $CLI volume attach-tier $V0 $H0:$B0/hot/${V0}{0..$1}
+        TEST $CLI volume tier $V0 attach $H0:$B0/hot/${V0}{0..$1}
         TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
         TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
         TEST $CLI volume set $V0 cluster.read-freq-threshold 0
diff --git a/tests/basic/tier/frequency-counters.t b/tests/basic/tier/frequency-counters.t
index c335c02c563..08e05df12e2 100644
--- a/tests/basic/tier/frequency-counters.t
+++ b/tests/basic/tier/frequency-counters.t
@@ -23,7 +23,7 @@ function create_dist_vol () {
 }
 
 function create_dist_tier_vol () {
-        TEST $CLI volume attach-tier $V0 $H0:$B0/hot/${V0}{0..$1}
+        TEST $CLI volume tier $V0 attach $H0:$B0/hot/${V0}{0..$1}
         TEST $CLI volume set $V0 cluster.tier-mode test
         TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
         TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
diff --git a/tests/basic/tier/legacy-many.t b/tests/basic/tier/legacy-many.t
index 1782ca70088..5795428c794 100644
--- a/tests/basic/tier/legacy-many.t
+++ b/tests/basic/tier/legacy-many.t
@@ -50,7 +50,7 @@ TEST create_many_files file $NUM_FILES
 wait
 
 # Attach tier
-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
 
 TEST $CLI volume set $V0 cluster.tier-mode test
 TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
diff --git a/tests/basic/tier/locked_file_migration.t b/tests/basic/tier/locked_file_migration.t
index 1a7e3f53c8e..7fb17171046 100755
--- a/tests/basic/tier/locked_file_migration.t
+++ b/tests/basic/tier/locked_file_migration.t
@@ -24,7 +24,7 @@ function create_dist_tier_vol () {
         TEST $CLI volume set $V0 performance.io-cache off
         TEST $CLI volume set $V0 features.ctr-enabled on
         TEST $CLI volume start $V0
-        TEST $CLI volume attach-tier $V0 $H0:$B0/hot/${V0}{0..$1}
+        TEST $CLI volume tier $V0 attach $H0:$B0/hot/${V0}{0..$1}
         TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
         TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
 
diff --git a/tests/basic/tier/readdir-during-migration.t b/tests/basic/tier/readdir-during-migration.t
index e2a43c93572..292ca882b79 100644
--- a/tests/basic/tier/readdir-during-migration.t
+++ b/tests/basic/tier/readdir-during-migration.t
@@ -20,7 +20,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}{0..$1}
+        TEST $CLI volume tier $V0 attach $H0:$B0/hot/${V0}{0..$1}
         TEST $CLI volume set $V0 cluster.tier-mode test
         TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
         TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
diff --git a/tests/basic/tier/record-metadata-heat.t b/tests/basic/tier/record-metadata-heat.t
index 44dda56a038..f6f35a83744 100755
--- a/tests/basic/tier/record-metadata-heat.t
+++ b/tests/basic/tier/record-metadata-heat.t
@@ -23,7 +23,7 @@ function create_dist_tier_vol () {
         TEST $CLI volume set $V0 performance.io-cache off
         TEST $CLI volume set $V0 features.ctr-enabled on
         TEST $CLI volume start $V0
-        TEST $CLI volume attach-tier $V0 $H0:$B0/hot/${V0}{0..$1}
+        TEST $CLI volume tier $V0 attach $H0:$B0/hot/${V0}{0..$1}
         TEST $CLI volume set $V0 cluster.tier-mode test
         TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
         TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
diff --git a/tests/basic/tier/tier-heald.t b/tests/basic/tier/tier-heald.t
index 8dcdd39c619..a8e634fb37b 100644
--- a/tests/basic/tier/tier-heald.t
+++ b/tests/basic/tier/tier-heald.t
@@ -18,7 +18,7 @@ volfile=$(gluster system:: getwd)"/glustershd/glustershd-server.vol"
 # volumes
 TEST $CLI volume create dist_tier $H0:$B0/cold
 TEST $CLI volume start dist_tier
-TEST $CLI volume attach-tier dist_tier $H0:$B0/hot
+TEST $CLI volume tier dist_tier attach $H0:$B0/hot
 
 TEST "[ -z $(get_shd_process_pid)]"
 TEST ! $CLI volume heal dist_tier enable
@@ -29,7 +29,7 @@ TEST $CLI volume create r2 replica 2 $H0:$B0/r2_0 $H0:$B0/r2_1
 TEST "[ -z $(get_shd_process_pid)]"
 TEST $CLI volume start r2
 
-TEST $CLI volume attach-tier r2 $H0:$B0/r2_hot
+TEST $CLI volume tier r2 attach $H0:$B0/r2_hot
 
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid
 TEST $CLI volume heal r2 enable
@@ -44,7 +44,7 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid
 TEST $CLI volume create ec2 disperse 3 redundancy 1 $H0:$B0/ec2_0 $H0:$B0/ec2_1 $H0:$B0/ec2_2
 TEST $CLI volume start ec2
 
-TEST $CLI volume attach-tier ec2 replica 2 $H0:$B0/ec2_hot{1..4}
+TEST $CLI volume tier ec2 attach replica 2 $H0:$B0/ec2_hot{1..4}
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid
 TEST $CLI volume heal ec2 enable
 EXPECT "enable" volume_option ec2 "cluster.disperse-self-heal-daemon"
@@ -75,7 +75,7 @@ TEST $CLI volume start ec2
 EXPECT "Y" volgen_volume_exists $volfile ec2-disperse-0 cluster disperse
 EXPECT "Y" volgen_volume_exists $volfile ec2-replicate-0 cluster replicate
 
-TEST $CLI volume detach-tier ec2 force
+TEST $CLI volume tier ec2 detach force
 
 EXPECT "Y" volgen_volume_exists $volfile ec2-disperse-0 cluster disperse
 EXPECT "N" volgen_volume_exists $volfile ec2-replicate-0 cluster replicate
diff --git a/tests/basic/tier/tier-snapshot.t b/tests/basic/tier/tier-snapshot.t
index 6d040d711c8..8747c5dc05d 100644
--- a/tests/basic/tier/tier-snapshot.t
+++ b/tests/basic/tier/tier-snapshot.t
@@ -14,7 +14,7 @@ TEST $CLI volume create $V0 replica 2 $H0:$L1 $H0:$L2 ;
 
 TEST $CLI volume start $V0;
 
-TEST $CLI volume attach-tier $V0 replica 2 $H0:$L3 $H0:$L4 ;
+TEST $CLI volume tier $V0 attach replica 2 $H0:$L3 $H0:$L4 ;
 
 TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0;
 
diff --git a/tests/basic/tier/tier_lookup_heal.t b/tests/basic/tier/tier_lookup_heal.t
index 7dac1fdf1ec..b4d9c54e9b9 100755
--- a/tests/basic/tier/tier_lookup_heal.t
+++ b/tests/basic/tier/tier_lookup_heal.t
@@ -43,7 +43,7 @@ TEST [ $ENTRY_COUNT -eq 0 ]
 
 
 #Attach tier and switch ON CTR Xlator.
-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
 TEST $CLI volume set $V0 features.ctr-enabled on
 TEST $CLI volume set $V0 cluster.tier-demote-frequency 4
 TEST $CLI volume set $V0 cluster.tier-promote-frequency 4
diff --git a/tests/basic/tier/tierd_check.t b/tests/basic/tier/tierd_check.t
index 55ca09a6b2f..5701fa98960 100644
--- a/tests/basic/tier/tierd_check.t
+++ b/tests/basic/tier/tierd_check.t
@@ -16,7 +16,7 @@ function check_peers {
 function create_dist_tier_vol () {
         TEST $CLI_1 volume create $V0 $H1:$B1/${V0} $H2:$B2/${V0}
         TEST $CLI_1 volume start $V0
-        TEST $CLI_1 volume attach-tier $V0 $H1:$B1/${V0}_h1 $H2:$B2/${V0}_h2
+        TEST $CLI_1 volume tier $V0 attach $H1:$B1/${V0}_h1 $H2:$B2/${V0}_h2
 }
 
 function tier_status () {
diff --git a/tests/basic/tier/unlink-during-migration.t b/tests/basic/tier/unlink-during-migration.t
index 0c2255cfda6..1330092177f 100755
--- a/tests/basic/tier/unlink-during-migration.t
+++ b/tests/basic/tier/unlink-during-migration.t
@@ -19,7 +19,7 @@ function create_dist_rep_vol () {
 }
 
 function attach_dist_rep_tier () {
-        TEST $CLI volume attach-tier $V0 replica 2 $H0:$B0/hot/${V0}{0..3}
+        TEST $CLI volume tier $V0 attach replica 2 $H0:$B0/hot/${V0}{0..3}
         TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
         TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
         TEST $CLI volume set $V0 cluster.read-freq-threshold 0
-- 
cgit