Simplified the layout of first library.

The IBM media is not supported, as can be see in the current version of the make_vtl_media script. IBM was removed from system test.

test/SystemTest/device.conf

@@ -52,30 +52,6 @@ Drive: 14 CHANNEL: 00 TARGET: 04 LUN: 00
  NAA: 10:22:33:44:ab:00:04:00
  Compression: factor 1 enabled 1
 
-Drive: 15 CHANNEL: 00 TARGET: 05 LUN: 00
- Library ID: 10 Slot: 05
- Vendor identification: IBM
- Product identification: 03592J1A
- Unit serial number: XYZZY_A4
- NAA: 10:22:33:44:ab:00:04:00
- Compression: factor 1 enabled 1
-
-Drive: 16 CHANNEL: 00 TARGET: 06 LUN: 00
- Library ID: 10 Slot: 06
- Vendor identification: IBM
- Product identification: 03592E05
- Unit serial number: XYZZY_A4
- NAA: 10:22:33:44:ab:00:04:00
- Compression: factor 1 enabled 1
-
-Drive: 17 CHANNEL: 00 TARGET: 07 LUN: 00
- Library ID: 10 Slot: 07
- Vendor identification: IBM
- Product identification: 03592E06
- Unit serial number: XYZZY_A4
- NAA: 10:22:33:44:ab:00:04:00
- Compression: factor 1 enabled 1
-
 Library: 30 CHANNEL: 00 TARGET: 08 LUN: 00
  Vendor identification: STK
  Product identification: L80

test/SystemTest/library_contents.10

@@ -3,9 +3,6 @@ Drive 1:
 Drive 2:
 Drive 3:
 Drive 4:
-Drive 5:
-Drive 6:
-Drive 7:
 
 Picker 1:
 
@@ -32,42 +29,7 @@ MAP 4:
 # Trailing "JW" - WORM 3592+
 # Trailing "JX" - WORM 3592E05+
 #
-Slot 1: E01001L4
+Slot 1: E01001L5
 Slot 2: E01002L4
 Slot 3: E01003L4
-Slot 4: E01004L4
-Slot 5: E01005L4
-Slot 6: E01006L4
-Slot 7: E01007L4
-Slot 8: E01008L4
-Slot 9: E01009L4
-Slot 10: E01010L4
-Slot 11: E01011L4
-Slot 12: E01012L4
-Slot 13: E01013L4
-Slot 14: E01014L4
-Slot 15: E01015L4
-Slot 16: E01016L4
-Slot 17: E01017L4
-Slot 18: E01018L4
-Slot 19: E01019L4
-Slot 20: E01020L4
-Slot 21:
-Slot 22: CLN101L4
-Slot 23: CLN102L5
-Slot 24:
-Slot 25:
-Slot 26:
-Slot 27:
-Slot 28:
-Slot 29:
-Slot 30: F01030L5
-Slot 31: F01031L5
-Slot 32: F01032L5
-Slot 33: F01033L5
-Slot 34: F01034L5
-Slot 35: F01035L5
-Slot 36: F01036L5
-Slot 37: F01037L5
-Slot 38: F01038L5
-Slot 39: F01039L5
+Slot 4: E01004L5

test/SystemTest/tape-server-system-test.sh

@@ -33,7 +33,7 @@ echo ${MC_DEVS}
 
 for i in $MC_DEVS; do
   for t in `seq \`mtx -f /dev/$i status | grep Transfer | wc -l\` `; do
-    mtx -f /dev/$i load $(($t + 1)) $t
+    mtx -f /dev/$i load $t $(($t - 1))
   done
   mtx -f /dev/$i status | grep Transfer
 done
@@ -41,3 +41,6 @@ done
 echo "## Starting system test program"
 /usr/local/bin/TapeDriveReadWriteTest
 
+echo "## Shutting down mhvtl"
+service mhvtl stop
+rmmod mhvtl