Introduce 'lmi storage' multiplexer.

All storage commands are now under 'lmi storage'.

7 files changed, 92 insertions, 92 deletions

diff --git a/commands/storage/test/lmi/test_deps.sh b/commands/storage/test/lmi/test_deps.sh
index 701df4a..7ec8aa6 100644
--- a/commands/storage/test/lmi/test_deps.sh
+++ b/commands/storage/test/lmi/test_deps.sh
@@ -56,24 +56,24 @@ DISKNAME=$( echo $LMI_STORAGE_DISK | sed 's!.*/!!' )
 
 rlPhaseStartTest "Setup"
     rlLogInfo "Create partitions"
-    rlRun "$LMI partition-table create --gpt $LMI_STORAGE_DISK"
-    rlRun "$LMI partition create $LMI_STORAGE_DISK $PARTSIZE"
-    rlRun "$LMI partition create $LMI_STORAGE_DISK $PARTSIZE"
-    rlRun "$LMI partition create $LMI_STORAGE_DISK"
+    rlRun "$LMI storage partition-table create --gpt $LMI_STORAGE_DISK"
+    rlRun "$LMI storage partition create $LMI_STORAGE_DISK $PARTSIZE"
+    rlRun "$LMI storage partition create $LMI_STORAGE_DISK $PARTSIZE"
+    rlRun "$LMI storage partition create $LMI_STORAGE_DISK"
 
     rlLogInfo "Create MD RAID"
-    rlRun "$LMI raid create --name=$MDNAME 0 ${LMI_STORAGE_DISK}1 ${LMI_STORAGE_DISK}2"
+    rlRun "$LMI storage raid create --name=$MDNAME 0 ${LMI_STORAGE_DISK}1 ${LMI_STORAGE_DISK}2"
 
     rlLogInfo "Create VG"
-    rlRun "$LMI vg create $VGNAME $MDNAME ${LMI_STORAGE_DISK}3"
+    rlRun "$LMI storage vg create $VGNAME $MDNAME ${LMI_STORAGE_DISK}3"
 
     rlLogInfo "Create LVs"
-    rlRun "$LMI lv create $VGNAME ${LVNAME}1 $PARTSIZE"
-    rlRun "$LMI lv create $VGNAME ${LVNAME}2 $PARTSIZE"
+    rlRun "$LMI storage lv create $VGNAME ${LVNAME}1 $PARTSIZE"
+    rlRun "$LMI storage lv create $VGNAME ${LVNAME}2 $PARTSIZE"
 
     rlLogInfo "Create filesystems"
-    rlRun "$LMI fs create xfs ${LVNAME}1"
-    rlRun "$LMI fs create ext4 ${LVNAME}2"
+    rlRun "$LMI storage fs create xfs ${LVNAME}1"
+    rlRun "$LMI storage fs create ext4 ${LVNAME}2"
 rlPhaseEnd
 
 function check_part1()
@@ -246,21 +246,21 @@ rlPhaseEnd
 
 rlPhaseStartTest "Cleanup"
     rlLogInfo "Delete filesystems"
-    rlRun "$LMI fs delete ${LVNAME}1"
-    rlRun "$LMI fs delete ${LVNAME}2"
+    rlRun "$LMI storage fs delete ${LVNAME}1"
+    rlRun "$LMI storage fs delete ${LVNAME}2"
 
     rlLogInfo "Delete LVs"
-    rlRun "$LMI lv delete ${LVNAME}1"
-    rlRun "$LMI lv delete ${LVNAME}2"
+    rlRun "$LMI storage lv delete ${LVNAME}1"
+    rlRun "$LMI storage lv delete ${LVNAME}2"
 
     rlLogInfo "Delete VG"
-    rlRun "$LMI vg delete $VGNAME"
+    rlRun "$LMI storage vg delete $VGNAME"
 
     rlLogInfo "Delete MD RAID"
-    rlRun "$LMI raid delete $MDNAME"
+    rlRun "$LMI storage raid delete $MDNAME"
 
     rlLogInfo "Delete partitions"
-    rlRun "$LMI partition delete ${LMI_STORAGE_DISK}1 ${LMI_STORAGE_DISK}2 ${LMI_STORAGE_DISK}3"
+    rlRun "$LMI storage partition delete ${LMI_STORAGE_DISK}1 ${LMI_STORAGE_DISK}2 ${LMI_STORAGE_DISK}3"
 rlPhaseEnd
 
 rlJournalPrintText
diff --git a/commands/storage/test/lmi/test_fs.sh b/commands/storage/test/lmi/test_fs.sh
index afcbe69..c16acb7 100644
--- a/commands/storage/test/lmi/test_fs.sh
+++ b/commands/storage/test/lmi/test_fs.sh
@@ -42,13 +42,13 @@ rlJournalStart
 part=${PARTITIONS[0]}
 rlPhaseStartTest
     rlLogInfo "Getting list of supported filesystems"
-    rlRun -s "$LMI -N fs list-supported"
+    rlRun -s "$LMI -N storage fs list-supported"
     filesystems=$(cat $rlRun_LOG)
     rm $rlRun_LOG
     for fsname in $filesystems; do
         rlLogInfo "Test fs create $fsname"
-        rlRun "$LMI fs create $fsname $part"
-        rlRun -s "$LMI -N -L csv fs list $part"
+        rlRun "$LMI storage fs create $fsname $part"
+        rlRun -s "$LMI -N -L csv storage fs list $part"
 
         rlLogInfo "Test fs list"
         # the last column is lower-case filesystem type in double quotes
@@ -63,7 +63,7 @@ rlPhaseStartTest
         rm $rlRun_LOG
 
         rlLogInfo "Test fs delete"
-        rlRun "$LMI fs delete $part"
+        rlRun "$LMI storage fs delete $part"
 
         rlLogInfo "Test the fs is really deleted"
         rlRun -s "file -s $part"
diff --git a/commands/storage/test/lmi/test_lvm.sh b/commands/storage/test/lmi/test_lvm.sh
index b2478db..f07d3dd 100644
--- a/commands/storage/test/lmi/test_lvm.sh
+++ b/commands/storage/test/lmi/test_lvm.sh
@@ -53,7 +53,7 @@ rlJournalStart
 
 rlPhaseStartTest "CreateVG"
     rlLogInfo "Creating a VG with specific extent size"
-    rlRun "$LMI vg create --extent-size=$EXTENT_SIZE $VGNAME ${PARTITIONS[*]}"
+    rlRun "$LMI storage vg create --extent-size=$EXTENT_SIZE $VGNAME ${PARTITIONS[*]}"
 
     rlLogInfo "Check that the VG exists"
     rlRun -s "vgs --noheading -o vg_name"
@@ -68,13 +68,13 @@ rlPhaseStartTest "CreateVG"
     rm $rlRun_LOG
 
     rlLogInfo "Check lmi vg list shows it"
-    rlRun -s "$LMI -N -H -L csv vg list"
+    rlRun -s "$LMI -N -H -L csv storage vg list"
     rlAssertGrep "\"LMI:VG:$VGNAME\"" $rlRun_LOG
     rlAssertGrep "\"$VGNAME\"" $rlRun_LOG
     rm $rlRun_LOG
 
     rlLogInfo "Check lmi vg show shows it"
-    rlRun -s "$LMI -N -H -L csv vg show"
+    rlRun -s "$LMI -N -H -L csv storage vg show"
     rlAssertGrep "\"InstanceID\",\"LMI:VG:$VGNAME\"" $rlRun_LOG
     rlAssertGrep "\"ElementName\",\"$VGNAME\"" $rlRun_LOG
     rlAssertGrep "\"Extent Size\",\"1024K\"" $rlRun_LOG
@@ -88,8 +88,8 @@ rlPhaseEnd
 
 rlPhaseStartTest "CreateLV"
     rlLogInfo "Creating LVs"
-    rlRun "$LMI lv create $VGNAME $LVNAME1 $LVSIZESPEC1"
-    rlRun "$LMI lv create $VGNAME $LVNAME2 $LVSIZESPEC2"
+    rlRun "$LMI storage lv create $VGNAME $LVNAME1 $LVSIZESPEC1"
+    rlRun "$LMI storage lv create $VGNAME $LVNAME2 $LVSIZESPEC2"
 
     rlLogInfo "Check that the LVs exist"
     rlRun -s "lvs --noheading -o lv_name"
@@ -98,7 +98,7 @@ rlPhaseStartTest "CreateLV"
     rm $rlRun_LOG
 
     rlLogInfo "Check lmi lv list shows them"
-    rlRun -s "$LMI -N -H -L csv lv list $VGNAME"
+    rlRun -s "$LMI -N -H -L csv storage lv list $VGNAME"
     rlAssertGrep "\"/dev/disk/by-id/dm-name-$VGNAME-$LVNAME1\"" $rlRun_LOG
     rlAssertGrep "\"$LVNAME1\"" $rlRun_LOG
     rlAssertGrep "\"$LVSIZE1\"" $rlRun_LOG
@@ -108,7 +108,7 @@ rlPhaseStartTest "CreateLV"
     rm $rlRun_LOG
 
     rlLogInfo "Check lmi lv show shows them"
-    rlRun -s "$LMI -N -H -L csv lv show $LVNAME1"
+    rlRun -s "$LMI -N -H -L csv storage lv show $LVNAME1"
     rlAssertGrep "\"DeviceID\",\"/dev/disk/by-id/dm-name-$VGNAME-$LVNAME1\"" $rlRun_LOG
     rlAssertGrep "\"Name\",\"/dev/mapper/$VGNAME-$LVNAME1\"" $rlRun_LOG
     rlAssertGrep "\"Volume Group\",\"$VGNAME\"" $rlRun_LOG
@@ -117,7 +117,7 @@ rlPhaseStartTest "CreateLV"
     rlAssertGrep "\"Extent Size\",\"$EXTENT_SIZE\"" $rlRun_LOG
     rm $rlRun_LOG
 
-    rlRun -s "$LMI -N -H -L csv lv show $LVNAME2"
+    rlRun -s "$LMI -N -H -L csv storage lv show $LVNAME2"
     rlAssertGrep "\"DeviceID\",\"/dev/disk/by-id/dm-name-$VGNAME-$LVNAME2\"" $rlRun_LOG
     rlAssertGrep "\"Name\",\"/dev/mapper/$VGNAME-$LVNAME2\"" $rlRun_LOG
     rlAssertGrep "\"Volume Group\",\"$VGNAME\"" $rlRun_LOG
@@ -126,8 +126,8 @@ rlPhaseStartTest "CreateLV"
     rlAssertGrep "\"Extent Size\",\"$EXTENT_SIZE\"" $rlRun_LOG
     rm $rlRun_LOG
 
-    rlLogInfo "Check lmi vg show shows them"
-    rlRun -s "$LMI -N -H -L csv vg show"
+    rlLogInfo "Check lmi storage vg show shows them"
+    rlRun -s "$LMI -N -H -L csv storage vg show"
     rlAssertGrep "Logical Volumes.*$LVNAME1" $rlRun_LOG
     rlAssertGrep "Logical Volumes.*$LVNAME2" $rlRun_LOG
 
@@ -136,7 +136,7 @@ rlPhaseEnd
 
 rlPhaseStartTest "DeleteLV"
     rlLogInfo "Deleting LVs"
-    rlRun "$LMI lv delete $LVNAME1 $LVNAME2"
+    rlRun "$LMI storage lv delete $LVNAME1 $LVNAME2"
 
     rlLogInfo "Check that the LVs is deleted"
     rlRun -s "lvs --noheading -o lv_name"
@@ -144,8 +144,8 @@ rlPhaseStartTest "DeleteLV"
     rlAssertNotGrep $LVNAME2 $rlRun_LOG
     rm $rlRun_LOG
 
-    rlLogInfo "Check lmi lv list doesn't show them"
-    rlRun -s "$LMI -N -H -L csv lv list $VGNAME"
+    rlLogInfo "Check lmi storage lv list doesn't show them"
+    rlRun -s "$LMI -N -H -L csv storage lv list $VGNAME"
     rlAssertNotGrep "\"LMI:/dev/disk/by-id/dm-name-$VGNAME-$LVNAME1\"" $rlRun_LOG
     rlAssertNotGrep "\"$LVNAME1\"" $rlRun_LOG
     rlAssertNotGrep "\"$LVSIZE1\"" $rlRun_LOG
@@ -154,8 +154,8 @@ rlPhaseStartTest "DeleteLV"
     rlAssertNotGrep "\"$LVSIZE2\"" $rlRun_LOG
     rm $rlRun_LOG
 
-    rlLogInfo "Check lmi vg show doesn't show them"
-    rlRun -s "$LMI -N -H -L csv vg show"
+    rlLogInfo "Check lmi storage vg show doesn't show them"
+    rlRun -s "$LMI -N -H -L csv storage vg show"
     rlAssertNotGrep "Logical Volumes.*$LVNAME1" $rlRun_LOG
     rlAssertNotGrep "Logical Volumes.*$LVNAME2" $rlRun_LOG
 rlPhaseEnd
@@ -163,15 +163,15 @@ rlPhaseEnd
 
 rlPhaseStartTest "DeleteVG"
     rlLogInfo "Delete the VG"
-    rlRun "$LMI vg delete $VGNAME"
+    rlRun "$LMI storage vg delete $VGNAME"
 
     rlLogInfo "Check that the VG is removed"
     rlRun -s "vgs --noheading -o vg_name"
     rlAssertNotGrep $VGNAME $rlRun_LOG
     rm $rlRun_LOG
 
-    rlLogInfo "Check lmi vg list does not show"
-    rlRun -s "$LMI -N -L csv vg list"
+    rlLogInfo "Check lmi storage vg list does not show"
+    rlRun -s "$LMI -N -L csv storage vg list"
     rlAssertNotGrep "\"LMI:VG:$VGNAME\"" $rlRun_LOG
     rlAssertNotGrep "\"$VGNAME\"" $rlRun_LOG
     rm $rlRun_LOG
diff --git a/commands/storage/test/lmi/test_mount.sh b/commands/storage/test/lmi/test_mount.sh
index 6a25ad2..1d8f615 100644
--- a/commands/storage/test/lmi/test_mount.sh
+++ b/commands/storage/test/lmi/test_mount.sh
@@ -43,23 +43,23 @@ testdir=$( mktemp -d /var/tmp/XXXXXXXXX )
 
 rlPhaseStartTest "Create filesystem"
     rlLogInfo "Create filesystem"
-    rlRun "$LMI fs create ext3 $part"
+    rlRun "$LMI storage fs create ext3 $part"
 rlPhaseEnd
 
 rlPhaseStartTest "Mount without any options"
     rlLogInfo "Mount the fs"
-    rlRun "$LMI mount create $part $testdir"
+    rlRun "$LMI storage mount create $part $testdir"
 
     rlLogInfo "Check it is mounted"
     rlAssertGrep "$part.*$testdir" /proc/mounts
 
     rlLogInfo "Check lmi mount list shows it"
-    rlRun -s "$LMI -NHL csv mount list"
+    rlRun -s "$LMI -NHL csv storage mount list"
     rlAssertGrep "\"$part\",\"ext3\",\"$testdir\"" $rlRun_LOG
     rm $rlRun_LOG
 
     rlLogInfo "Check lmi mount show shows it"
-    rlRun -s "$LMI -NHL csv mount show"
+    rlRun -s "$LMI -NHL csv storage mount show"
     rlAssertGrep "\"Mountpoint\",\"$testdir\"" $rlRun_LOG
     rlAssertGrep "\"Filesystem\",\"$part" $rlRun_LOG
     rm $rlRun_LOG
@@ -67,13 +67,13 @@ rlPhaseEnd
 
 rlPhaseStartTest "Unmount"
     rlLogInfo "Unmount the fs"
-    rlRun "$LMI mount delete $part"
+    rlRun "$LMI storage mount delete $part"
 
     rlLogInfo "Check it is unmounted"
     rlAssertNotGrep "$part.*$testdir" /proc/mounts
 
-    rlLogInfo "Check lmi mount list doesn't show it"
-    rlRun -s "$LMI -NHL csv mount list"
+    rlLogInfo "Check lmi storage mount list doesn't show it"
+    rlRun -s "$LMI -NHL csv storage mount list"
     rlAssertNptGrep "\"$part\",\"ext3\",\"$testdir\"" $rlRun_LOG
     rm $rlRun_LOG
 rlPhaseEnd
@@ -81,7 +81,7 @@ rlPhaseEnd
 
 rlPhaseStartTest "Delete filesystem"
     rlLogInfo "Delete filesystem"
-    rlRun "$LMI fs delete $part"
+    rlRun "$LMI storage fs delete $part"
 rlPhaseEnd
 
 rlJournalPrintText
diff --git a/commands/storage/test/lmi/test_partition_gpt.sh b/commands/storage/test/lmi/test_partition_gpt.sh
index 55e932f..2423fc5 100644
--- a/commands/storage/test/lmi/test_partition_gpt.sh
+++ b/commands/storage/test/lmi/test_partition_gpt.sh
@@ -48,7 +48,7 @@ SIZE2=20M
 
 rlPhaseStartTest "Create the partition table"
 	rlLogInfo "Creating partition table"
-	rlRun "$LMI partition-table create --gpt $LMI_STORAGE_DISK"
+	rlRun "$LMI storage partition-table create --gpt $LMI_STORAGE_DISK"
 
     rlLogInfo "Check the partition table exists"
     rlRun -s "parted $LMI_STORAGE_DISK print"
@@ -56,12 +56,12 @@ rlPhaseStartTest "Create the partition table"
     rm $rlRun_LOG
 
     rlLogInfo "Check lmi partition-table list shows it"
-    rlRun -s "$LMI -NHL csv partition-table list $LMI_STORAGE_DISK"
+    rlRun -s "$LMI -NHL csv storage partition-table list $LMI_STORAGE_DISK"
     rlAssertGrep "\"$LMI_STORAGE_DISK\"" $rlRun_LOG
     rm $rlRun_LOG
 
     rlLogInfo "Check lmi partition-table show shows it"
-    rlRun -s "$LMI -NHL csv partition-table show $LMI_STORAGE_DISK"
+    rlRun -s "$LMI -NHL csv storage partition-table show $LMI_STORAGE_DISK"
     rlAssertGrep "\"Partition Table Type\",\"GPT\"" $rlRun_LOG
     rlAssertGrep "\"Partition Table Size (in blocks)\",68" $rlRun_LOG
     rm $rlRun_LOG
@@ -69,31 +69,31 @@ rlPhaseEnd
 
 rlPhaseStartTest "Create partitions"
     rlLogInfo "Creating partitions"
-    rlRun "$LMI partition create $LMI_STORAGE_DISK $SIZE1"
-    rlRun "$LMI partition create $LMI_STORAGE_DISK $SIZE2"
-    rlRun "$LMI partition create $LMI_STORAGE_DISK"
+    rlRun "$LMI storage partition create $LMI_STORAGE_DISK $SIZE1"
+    rlRun "$LMI storage partition create $LMI_STORAGE_DISK $SIZE2"
+    rlRun "$LMI storage partition create $LMI_STORAGE_DISK"
 
-    rlLogInfo "Check lmi partition list shows them"
-    rlRun -s "$LMI -NHL csv partition list $LMI_STORAGE_DISK"
+    rlLogInfo "Check lmi storage partition list shows them"
+    rlRun -s "$LMI -NHL csv storage partition list $LMI_STORAGE_DISK"
     rlAssertGrep "\"${LMI_STORAGE_DISK}1\",\"${DISKNAME}1\",\"\",\"$SIZE1\"" $rlRun_LOG
     rlAssertGrep "\"${LMI_STORAGE_DISK}2\",\"${DISKNAME}2\",\"\",\"$SIZE2\"" $rlRun_LOG
     rlAssertGrep "\"${LMI_STORAGE_DISK}3\",\"${DISKNAME}3\"" $rlRun_LOG
     rm $rlRun_LOG
 
-    rlLogInfo "Check lmi partition show shows them"
-    rlRun -s "$LMI -NHL csv partition show ${LMI_STORAGE_DISK}1"
+    rlLogInfo "Check lmi storage partition show shows them"
+    rlRun -s "$LMI -NHL csv storage partition show ${LMI_STORAGE_DISK}1"
     rlAssertGrep "\"Name\",\"${LMI_STORAGE_DISK}1\"" $rlRun_LOG
     rlAssertGrep "\"ElementName\",\"${DISKNAME}1\"" $rlRun_LOG
     rlAssertGrep "\"Total Size\",\"$SIZE1\"" $rlRun_LOG
     rlAssertGrep "\"Disk\",\"${LMI_STORAGE_DISK}\"" $rlRun_LOG
     rm $rlRun_LOG
-    rlRun -s "$LMI -NHL csv partition show ${LMI_STORAGE_DISK}2"
+    rlRun -s "$LMI -NHL csv storage partition show ${LMI_STORAGE_DISK}2"
     rlAssertGrep "\"Name\",\"${LMI_STORAGE_DISK}2\"" $rlRun_LOG
     rlAssertGrep "\"ElementName\",\"${DISKNAME}2\"" $rlRun_LOG
     rlAssertGrep "\"Total Size\",\"$SIZE2\"" $rlRun_LOG
     rlAssertGrep "\"Disk\",\"${LMI_STORAGE_DISK}\"" $rlRun_LOG
     rm $rlRun_LOG
-    rlRun -s "$LMI -NHL csv partition show ${LMI_STORAGE_DISK}3"
+    rlRun -s "$LMI -NHL csv storage partition show ${LMI_STORAGE_DISK}3"
     rlAssertGrep "\"Name\",\"${LMI_STORAGE_DISK}3\"" $rlRun_LOG
     rlAssertGrep "\"ElementName\",\"${DISKNAME}3\"" $rlRun_LOG
     rlAssertGrep "\"Disk\",\"${LMI_STORAGE_DISK}\"" $rlRun_LOG
@@ -102,10 +102,10 @@ rlPhaseEnd
 
 rlPhaseStartTest "Delete partitions"
     rlLogInfo "Deleting partitions"
-    rlRun "$LMI partition delete ${LMI_STORAGE_DISK}1 ${LMI_STORAGE_DISK}2 ${LMI_STORAGE_DISK}3"
+    rlRun "$LMI storage partition delete ${LMI_STORAGE_DISK}1 ${LMI_STORAGE_DISK}2 ${LMI_STORAGE_DISK}3"
 
-    rlLogInfo "Check lmi partition list does not show them"
-    rlRun -s "$LMI -NHL csv partition list $LMI_STORAGE_DISK"
+    rlLogInfo "Check lmi storage partition list does not show them"
+    rlRun -s "$LMI -NHL csv storage partition list $LMI_STORAGE_DISK"
     rlAssertNotGrep "\"${LMI_STORAGE_DISK}1\",\"${DISKNAME}1\",\"\",\"$SIZE1\"" $rlRun_LOG
     rlAssertNotGrep "\"${LMI_STORAGE_DISK}2\",\"${DISKNAME}2\",\"\",\"$SIZE2\"" $rlRun_LOG
     rlAssertNotGrep "\"${LMI_STORAGE_DISK}3\",\"${DISKNAME}3\"" $rlRun_LOG
diff --git a/commands/storage/test/lmi/test_partition_msdos.sh b/commands/storage/test/lmi/test_partition_msdos.sh
index 97a0ed3..2c05a47 100644
--- a/commands/storage/test/lmi/test_partition_msdos.sh
+++ b/commands/storage/test/lmi/test_partition_msdos.sh
@@ -48,20 +48,20 @@ SIZE2=20M # first logical
 
 rlPhaseStartTest "Create the partition table"
 	rlLogInfo "Creating partition table"
-	rlRun "$LMI partition-table create --msdos $LMI_STORAGE_DISK"
+	rlRun "$LMI storage partition-table create --msdos $LMI_STORAGE_DISK"
 
     rlLogInfo "Check the partition table exists"
     rlRun -s "parted $LMI_STORAGE_DISK print"
     rlAssertGrep "Partition Table: msdos" $rlRun_LOG
     rm $rlRun_LOG
 
-    rlLogInfo "Check lmi partition-table list shows it"
-    rlRun -s "$LMI -NHL csv partition-table list $LMI_STORAGE_DISK"
+    rlLogInfo "Check lmi storage partition-table list shows it"
+    rlRun -s "$LMI -NHL csv storage partition-table list $LMI_STORAGE_DISK"
     rlAssertGrep "\"$LMI_STORAGE_DISK\"" $rlRun_LOG
     rm $rlRun_LOG
 
-    rlLogInfo "Check lmi partition-table show shows it"
-    rlRun -s "$LMI -NHL csv partition-table show $LMI_STORAGE_DISK"
+    rlLogInfo "Check lmi storage partition-table show shows it"
+    rlRun -s "$LMI -NHL csv storage partition-table show $LMI_STORAGE_DISK"
     rlAssertGrep "\"Partition Table Type\",\"MS-DOS\"" $rlRun_LOG
     rlAssertGrep "\"Partition Table Size (in blocks)\",1" $rlRun_LOG
     rm $rlRun_LOG
@@ -69,15 +69,15 @@ rlPhaseEnd
 
 rlPhaseStartTest "Create partitions"
     rlLogInfo "Creating partitions"
-    rlRun "$LMI partition create $LMI_STORAGE_DISK $SIZE1"
-    rlRun "$LMI partition create --extended $LMI_STORAGE_DISK"
-    rlRun "$LMI partition create --logical $LMI_STORAGE_DISK $SIZE2"
-    rlRun "$LMI partition create --logical $LMI_STORAGE_DISK"
+    rlRun "$LMI storage partition create $LMI_STORAGE_DISK $SIZE1"
+    rlRun "$LMI storage partition create --extended $LMI_STORAGE_DISK"
+    rlRun "$LMI storage partition create --logical $LMI_STORAGE_DISK $SIZE2"
+    rlRun "$LMI storage partition create --logical $LMI_STORAGE_DISK"
 
-    rlLogInfo "Check lmi partition list shows them"
-    rlRun "$LMI -NHL csv partition list"
-    rlRun "$LMI -NHL csv partition list ${LMI_STORAGE_DISK}2"
-    rlRun -s "$LMI -NHL csv partition list $LMI_STORAGE_DISK"
+    rlLogInfo "Check lmi storage partition list shows them"
+    rlRun "$LMI -NHL csv storage partition list"
+    rlRun "$LMI -NHL csv storage partition list ${LMI_STORAGE_DISK}2"
+    rlRun -s "$LMI -NHL csv storage partition list $LMI_STORAGE_DISK"
     rlAssertGrep "\"${LMI_STORAGE_DISK}1\",\"${DISKNAME}1\",\"primary\",\"$SIZE1\"" $rlRun_LOG
     rlAssertGrep "\"${LMI_STORAGE_DISK}2\",\"${DISKNAME}2\",\"extended\"," $rlRun_LOG
     rlAssertGrep "\"${LMI_STORAGE_DISK}5\",\"${DISKNAME}5\",\"logical\",\"$SIZE2\"" $rlRun_LOG
@@ -85,27 +85,27 @@ rlPhaseStartTest "Create partitions"
     rm $rlRun_LOG
 
     rlLogInfo "Check lmi partition show shows them"
-    rlRun -s "$LMI -NHL csv partition show ${LMI_STORAGE_DISK}1"
+    rlRun -s "$LMI -NHL csv storage partition show ${LMI_STORAGE_DISK}1"
     rlAssertGrep "\"Name\",\"${LMI_STORAGE_DISK}1\"" $rlRun_LOG
     rlAssertGrep "\"ElementName\",\"${DISKNAME}1\"" $rlRun_LOG
     rlAssertGrep "\"Total Size\",\"$SIZE1\"" $rlRun_LOG
     rlAssertGrep "\"Disk\",\"${LMI_STORAGE_DISK}\"" $rlRun_LOG
     rlAssertGrep "\"Partition Type\",\"primary\"" $rlRun_LOG
     rm $rlRun_LOG
-    rlRun -s "$LMI -NHL csv partition show ${LMI_STORAGE_DISK}2"
+    rlRun -s "$LMI -NHL csv storage partition show ${LMI_STORAGE_DISK}2"
     rlAssertGrep "\"Name\",\"${LMI_STORAGE_DISK}2\"" $rlRun_LOG
     rlAssertGrep "\"ElementName\",\"${DISKNAME}2\"" $rlRun_LOG
     rlAssertGrep "\"Disk\",\"${LMI_STORAGE_DISK}\"" $rlRun_LOG
     rlAssertGrep "\"Partition Type\",\"extended\"" $rlRun_LOG
     rm $rlRun_LOG
-    rlRun -s "$LMI -NHL csv partition show ${LMI_STORAGE_DISK}5"
+    rlRun -s "$LMI -NHL csv storage partition show ${LMI_STORAGE_DISK}5"
     rlAssertGrep "\"Name\",\"${LMI_STORAGE_DISK}5\"" $rlRun_LOG
     rlAssertGrep "\"ElementName\",\"${DISKNAME}5\"" $rlRun_LOG
     rlAssertGrep "\"Total Size\",\"$SIZE2\"" $rlRun_LOG
     rlAssertGrep "\"Disk\",\"${LMI_STORAGE_DISK}\"" $rlRun_LOG
     rlAssertGrep "\"Partition Type\",\"logical\"" $rlRun_LOG
     rm $rlRun_LOG
-    rlRun -s "$LMI -NHL csv partition show ${LMI_STORAGE_DISK}6"
+    rlRun -s "$LMI -NHL csv storage partition show ${LMI_STORAGE_DISK}6"
     rlAssertGrep "\"Name\",\"${LMI_STORAGE_DISK}6\"" $rlRun_LOG
     rlAssertGrep "\"ElementName\",\"${DISKNAME}6\"" $rlRun_LOG
     rlAssertGrep "\"Disk\",\"${LMI_STORAGE_DISK}\"" $rlRun_LOG
@@ -115,10 +115,10 @@ rlPhaseEnd
 
 rlPhaseStartTest "Delete partitions"
     rlLogInfo "Deleting partitions"
-    rlRun "$LMI partition delete ${LMI_STORAGE_DISK}1 ${LMI_STORAGE_DISK}5 ${LMI_STORAGE_DISK}5 ${LMI_STORAGE_DISK}2"
+    rlRun "$LMI storage partition delete ${LMI_STORAGE_DISK}1 ${LMI_STORAGE_DISK}5 ${LMI_STORAGE_DISK}5 ${LMI_STORAGE_DISK}2"
 
-    rlLogInfo "Check lmi partition list does not show them"
-    rlRun -s "$LMI -NHL csv partition list $LMI_STORAGE_DISK"
+    rlLogInfo "Check lmi storage partition list does not show them"
+    rlRun -s "$LMI -NHL csv storage partition list $LMI_STORAGE_DISK"
     rlAssertNotGrep "\"${LMI_STORAGE_DISK}1\",\"${DISKNAME}1\",\"\",\"$SIZE1\"" $rlRun_LOG
     rlAssertNotGrep "\"${LMI_STORAGE_DISK}2\",\"${DISKNAME}2\"" $rlRun_LOG
     rlAssertNotGrep "\"${LMI_STORAGE_DISK}5\",\"${DISKNAME}5\"" $rlRun_LOG
diff --git a/commands/storage/test/lmi/test_raid.sh b/commands/storage/test/lmi/test_raid.sh
index 3bd5ed1..8d8d15f 100644
--- a/commands/storage/test/lmi/test_raid.sh
+++ b/commands/storage/test/lmi/test_raid.sh
@@ -49,7 +49,7 @@ function test_raid() {
 
 	rlPhaseStartTest "Create RAID $level: $name on $parts"
 		rlLogInfo "Creating the RAID"
-		rlRun "$LMI raid create --name="$name" $level $parts"
+		rlRun "$LMI storage raid create --name="$name" $level $parts"
 
 	    rlLogInfo "Check that the RAID exists"
 	    rlRun "ls -l /dev/md/$name"
@@ -59,16 +59,16 @@ function test_raid() {
 	    done
 	    rm $rlRun_LOG
 
-        rlLogInfo "Check lmi raid list output"
-        rlRun -s "$LMI -NHL csv raid list"
+        rlLogInfo "Check lmi storage raid list output"
+        rlRun -s "$LMI -NHL csv storage raid list"
         rlAssertGrep "\"$name\"" $rlRun_LOG
         rlAssertGrep "\"/dev/disk/by-id/md-name-.*:$name\"" $rlRun_LOG
         member_count=$(echo $parts | wc -w)
         rlAssertGrep ",$level,$member_count\$" $rlRun_LOG
         rm $rlRun_LOG
 
-        rlLogInfo "Check lmi raid show output"
-        rlRun -s "$LMI -NHL csv raid show $name"
+        rlLogInfo "Check lmi storage raid show output"
+        rlRun -s "$LMI -NHL csv storage raid show $name"
         rlAssertGrep "\"DeviceID\",\"/dev/disk/by-id/md-name-.*:$name\"" $rlRun_LOG
         rlAssertGrep "\"Name\",\"/dev/md/$name\"" $rlRun_LOG
         rlAssertGrep "\"ElementName\",\"$name\"" $rlRun_LOG
@@ -81,20 +81,20 @@ function test_raid() {
 
     rlPhaseStartTest "Delete RAID $level: $name on $parts"
         rlLogInfo "deleting the RAID"
-        rlRun "$LMI raid delete $name"
+        rlRun "$LMI storage raid delete $name"
 
         rlLogInfo "Check that the RAID does not exist"
         rlRun "ls -l /dev/md/$name" 2
         rlRun "mdadm -D /dev/md/$name" 1
 
-        rlLogInfo "Check lmi raid list output"
-        rlRun -s "$LMI -NHL csv raid list"
+        rlLogInfo "Check lmi storage raid list output"
+        rlRun -s "$LMI -NHL csv storage raid list"
         rlAssertNotGrep "\"$name\"" $rlRun_LOG
         rlAssertNotGrep "\"/dev/disk/by-id/md-name-.*:$name\"" $rlRun_LOG
         rm $rlRun_LOG
 
-        rlLogInfo "Check lmi raid show output"
-        rlRun -s "$LMI -NHL csv raid show $name" 1
+        rlLogInfo "Check lmi storage raid show output"
+        rlRun -s "$LMI -NHL csv storage raid show $name" 1
         rlAssertNotGrep "\"DeviceID\",\"/dev/disk/by-id/md-name-.*:$name\"" $rlRun_LOG
         rlAssertNotGrep "\"Name\",\"/dev/md/$name\"" $rlRun_LOG
     rlPhaseEnd