diff options
author | Jan Safranek <jsafrane@redhat.com> | 2014-02-17 10:35:01 +0100 |
---|---|---|
committer | Jan Safranek <jsafrane@redhat.com> | 2014-02-17 10:35:01 +0100 |
commit | 56469ddbfd99f3a76d7c4f6dbd8fec130cea0b6b (patch) | |
tree | 7142581df5ae32aad28984750937640f7ab74bc9 /commands/storage/test | |
parent | 4130fd07bb27b447bdd230bf7323208379f007b6 (diff) | |
download | openlmi-scripts-56469ddbfd99f3a76d7c4f6dbd8fec130cea0b6b.tar.gz openlmi-scripts-56469ddbfd99f3a76d7c4f6dbd8fec130cea0b6b.tar.xz openlmi-scripts-56469ddbfd99f3a76d7c4f6dbd8fec130cea0b6b.zip |
Do not show DeviceID in lists.
DeviceID is internal OpenLMI ID to identify block devices. It's quite long
and most admins will use '/dev/sda' (or just 'sda') anyway, so let's remove
it from all 'list' commands output.
'show' command will show it, if anybody is interested.
Diffstat (limited to 'commands/storage/test')
-rw-r--r-- | commands/storage/test/lmi/test_deps.sh | 16 | ||||
-rw-r--r-- | commands/storage/test/lmi/test_fs.sh | 2 | ||||
-rw-r--r-- | commands/storage/test/lmi/test_lvm.sh | 13 | ||||
-rw-r--r-- | commands/storage/test/lmi/test_partition_gpt.sh | 12 | ||||
-rw-r--r-- | commands/storage/test/lmi/test_partition_msdos.sh | 14 | ||||
-rw-r--r-- | commands/storage/test/lmi/test_raid.sh | 4 |
6 files changed, 27 insertions, 34 deletions
diff --git a/commands/storage/test/lmi/test_deps.sh b/commands/storage/test/lmi/test_deps.sh index 7ec8aa6..d04f7d1 100644 --- a/commands/storage/test/lmi/test_deps.sh +++ b/commands/storage/test/lmi/test_deps.sh @@ -79,49 +79,49 @@ rlPhaseEnd function check_part1() { prefix=$1 - rlAssertGrep "$prefix.*\"${LMI_STORAGE_DISK}1\",\"${DISKNAME}1\",\"$PARTSIZE\",\"software RAID\"" $rlRun_LOG + rlAssertGrep "\"$prefix${LMI_STORAGE_DISK}1\",\"$PARTSIZE\",\"software RAID\"" $rlRun_LOG } function check_part2() { prefix=$1 - rlAssertGrep "$prefix.*\"${LMI_STORAGE_DISK}2\",\"${DISKNAME}2\",\"$PARTSIZE\",\"software RAID\"" $rlRun_LOG + rlAssertGrep "\"$prefix${LMI_STORAGE_DISK}2\",\"$PARTSIZE\",\"software RAID\"" $rlRun_LOG } function check_part3() { prefix=$1 - rlAssertGrep "$prefix.*\"${LMI_STORAGE_DISK}3\",\"${DISKNAME}3\",\".*\",\"physical volume (LVM)\"" $rlRun_LOG + rlAssertGrep "\"$prefix${LMI_STORAGE_DISK}3\",\".*\",\"physical volume (LVM)\"" $rlRun_LOG } function check_md() { prefix=$1 - rlAssertGrep "\"$prefix/dev/disk/by-id/md-name-.*:$MDNAME\",\"/dev/md/$MDNAME\",\"$MDNAME\",\".*\",\"physical volume (LVM)\"" $rlRun_LOG + rlAssertGrep "\"$prefix/dev/md/$MDNAME\",\".*\",\"physical volume (LVM)\"" $rlRun_LOG } function check_lv1() { prefix=$1 - rlAssertGrep "\"$prefix/dev/disk/by-id/dm-name-$VGNAME-${LVNAME}1\",\"/dev/mapper/$VGNAME-${LVNAME}1\",\"${LVNAME}1\",\".*M\",\"xfs\"" $rlRun_LOG + rlAssertGrep "\"$prefix/dev/mapper/$VGNAME-${LVNAME}1\",\".*M\",\"xfs\"" $rlRun_LOG } function check_lv2() { prefix=$1 - rlAssertGrep "\"$prefix/dev/disk/by-id/dm-name-$VGNAME-${LVNAME}2\",\"/dev/mapper/$VGNAME-${LVNAME}2\",\"${LVNAME}2\",\".*M\",\"ext4\"" $rlRun_LOG + rlAssertGrep "\"$prefix/dev/mapper/$VGNAME-${LVNAME}2\",\".*M\",\"ext4\"" $rlRun_LOG } function check_disk() { prefix=$1 - rlAssertGrep "$prefix.*\"$LMI_STORAGE_DISK\",\"$DISKNAME\",\".*\",\"GPT partition table\"" $rlRun_LOG + rlAssertGrep "\"$prefix$LMI_STORAGE_DISK\".*,\"GPT partition table\"" $rlRun_LOG } function check_vg() { prefix=$1 - rlAssertGrep "\"${prefix}LMI:VG:$VGNAME\",\"$VGNAME\",\"$VGNAME\",\".*\",\"volume group (LVM)\"" $rlRun_LOG + rlAssertGrep "\"$prefix$VGNAME\",.*,\"volume group (LVM)\"" $rlRun_LOG } rlPhaseStartTest "lmi storage list" diff --git a/commands/storage/test/lmi/test_fs.sh b/commands/storage/test/lmi/test_fs.sh index c16acb7..aea1d5c 100644 --- a/commands/storage/test/lmi/test_fs.sh +++ b/commands/storage/test/lmi/test_fs.sh @@ -52,7 +52,7 @@ rlPhaseStartTest rlLogInfo "Test fs list" # the last column is lower-case filesystem type in double quotes - fstype=$(cat $rlRun_LOG | cut -f 4 -d ',' ) + fstype=$(cat $rlRun_LOG | cut -f 3 -d ',' ) rlAssertEquals "Checking fs $fsname is present on $part" "\"$fsname\"" $fstype rm $rlRun_LOG diff --git a/commands/storage/test/lmi/test_lvm.sh b/commands/storage/test/lmi/test_lvm.sh index f07d3dd..ae5411c 100644 --- a/commands/storage/test/lmi/test_lvm.sh +++ b/commands/storage/test/lmi/test_lvm.sh @@ -69,7 +69,6 @@ rlPhaseStartTest "CreateVG" rlLogInfo "Check lmi vg list shows it" rlRun -s "$LMI -N -H -L csv storage vg list" - rlAssertGrep "\"LMI:VG:$VGNAME\"" $rlRun_LOG rlAssertGrep "\"$VGNAME\"" $rlRun_LOG rm $rlRun_LOG @@ -99,15 +98,13 @@ rlPhaseStartTest "CreateLV" rlLogInfo "Check lmi lv list shows them" 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 "\"/dev/mapper/$VGNAME-$LVNAME1\"" $rlRun_LOG rlAssertGrep "\"$LVSIZE1\"" $rlRun_LOG - rlAssertGrep "\"/dev/disk/by-id/dm-name-$VGNAME-$LVNAME2\"" $rlRun_LOG - rlAssertGrep "\"$LVNAME2\"" $rlRun_LOG + rlAssertGrep "\"/dev/mapper/$VGNAME-$LVNAME2\"" $rlRun_LOG rlAssertGrep "\"$LVSIZE2\"" $rlRun_LOG rm $rlRun_LOG - rlLogInfo "Check lmi lv show shows them" + rlLogInfo "Check lmi storage lv show shows them" 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 @@ -146,11 +143,9 @@ rlPhaseStartTest "DeleteLV" 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 "\"/dev/mapper/$VGNAME-$LVNAME1\"" $rlRun_LOG rlAssertNotGrep "\"$LVSIZE1\"" $rlRun_LOG rlAssertNotGrep "\"LMI:/dev/disk/by-id/dm-name-$VGNAME-$LVNAME2\"" $rlRun_LOG - rlAssertNotGrep "\"$LVNAME2\"" $rlRun_LOG rlAssertNotGrep "\"$LVSIZE2\"" $rlRun_LOG rm $rlRun_LOG diff --git a/commands/storage/test/lmi/test_partition_gpt.sh b/commands/storage/test/lmi/test_partition_gpt.sh index 2423fc5..c794245 100644 --- a/commands/storage/test/lmi/test_partition_gpt.sh +++ b/commands/storage/test/lmi/test_partition_gpt.sh @@ -75,9 +75,9 @@ rlPhaseStartTest "Create partitions" 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 + rlAssertGrep "\"${LMI_STORAGE_DISK}1\",\"\",\"$SIZE1\"" $rlRun_LOG + rlAssertGrep "\"${LMI_STORAGE_DISK}2\",\"\",\"$SIZE2\"" $rlRun_LOG + rlAssertGrep "\"${LMI_STORAGE_DISK}3\"," $rlRun_LOG rm $rlRun_LOG rlLogInfo "Check lmi storage partition show shows them" @@ -106,9 +106,9 @@ rlPhaseStartTest "Delete partitions" 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 + rlAssertNotGrep "\"${LMI_STORAGE_DISK}1\",\"\",\"$SIZE1\"" $rlRun_LOG + rlAssertNotGrep "\"${LMI_STORAGE_DISK}2\",\"\",\"$SIZE2\"" $rlRun_LOG + rlAssertNotGrep "\"${LMI_STORAGE_DISK}3\"," $rlRun_LOG rm $rlRun_LOG rlPhaseEnd diff --git a/commands/storage/test/lmi/test_partition_msdos.sh b/commands/storage/test/lmi/test_partition_msdos.sh index 2c05a47..da08168 100644 --- a/commands/storage/test/lmi/test_partition_msdos.sh +++ b/commands/storage/test/lmi/test_partition_msdos.sh @@ -78,10 +78,10 @@ rlPhaseStartTest "Create partitions" 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 - rlAssertGrep "\"${LMI_STORAGE_DISK}6\",\"${DISKNAME}6\",\"logical\"," $rlRun_LOG + rlAssertGrep "\"${LMI_STORAGE_DISK}1\",\"primary\",\"$SIZE1\"" $rlRun_LOG + rlAssertGrep "\"${LMI_STORAGE_DISK}2\",\"extended\"," $rlRun_LOG + rlAssertGrep "\"${LMI_STORAGE_DISK}5\",\"logical\",\"$SIZE2\"" $rlRun_LOG + rlAssertGrep "\"${LMI_STORAGE_DISK}6\",\"logical\"," $rlRun_LOG rm $rlRun_LOG rlLogInfo "Check lmi partition show shows them" @@ -119,9 +119,9 @@ rlPhaseStartTest "Delete partitions" 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 + rlAssertNotGrep "\"${LMI_STORAGE_DISK}1\"" $rlRun_LOG + rlAssertNotGrep "\"${LMI_STORAGE_DISK}2\"" $rlRun_LOG + rlAssertNotGrep "\"${LMI_STORAGE_DISK}5\"" $rlRun_LOG rm $rlRun_LOG rlPhaseEnd diff --git a/commands/storage/test/lmi/test_raid.sh b/commands/storage/test/lmi/test_raid.sh index 8d8d15f..0295497 100644 --- a/commands/storage/test/lmi/test_raid.sh +++ b/commands/storage/test/lmi/test_raid.sh @@ -62,7 +62,6 @@ function test_raid() { 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 @@ -89,8 +88,7 @@ function test_raid() { 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 + rlAssertNotGrep "\"/dev/md/$name\"" $rlRun_LOG rm $rlRun_LOG rlLogInfo "Check lmi storage raid show output" |