Adding Last Verified to the get_tape output (#209)

Author: rpmoore

ds3_java_cli/src/main/java/com/spectralogic/ds3cli/views/cli/GetTapesView.java

@@ -49,7 +49,7 @@ public String render(final GetTapesResult getTapesResult) {
 
         this.getTapesResult = getTapesResult;
 
-        initTable(ImmutableList.of("Bar Code", "ID", "State", "Last Modified", "Available Raw Capacity", "BucketID", "Assigned to Storage Domain", "Ejection Date", "Ejection Location", "Ejection Label", "Ejection Pending"));
+        initTable(ImmutableList.of("Bar Code", "ID", "State", "Last Modified", "Last Verified", "Available Raw Capacity", "BucketID", "Assigned to Storage Domain", "Ejection Date", "Ejection Location", "Ejection Label", "Ejection Pending"));
 
         return ASCIITable.getInstance().getTable(getHeaders(), formatTableContents());
     }
@@ -65,13 +65,14 @@ protected String[][] formatTableContents() {
             bucketArray[1] = nullGuardToString(tape.getId());
             bucketArray[2] = nullGuardToString(tape.getState());
             bucketArray[3] = nullGuardFromDate(tape.getLastModified(), DATE_FORMAT);
-            bucketArray[4] = nullGuardToString(tape.getAvailableRawCapacity());
-            bucketArray[5] = nullGuardToString(tape.getBucketId());
-            bucketArray[6] = nullGuardToString(storageDomainName(tape));
-            bucketArray[7] = nullGuardFromDate(tape.getEjectDate(), DATE_FORMAT);
-            bucketArray[8] = nullGuard(tape.getEjectLocation());
-            bucketArray[9] = nullGuard(tape.getEjectLabel());
-            bucketArray[10] = nullGuardFromDate(tape.getEjectPending(), DATE_FORMAT);
+            bucketArray[4] = nullGuardFromDate(tape.getLastVerified(), DATE_FORMAT);
+            bucketArray[5] = nullGuardToString(tape.getAvailableRawCapacity());
+            bucketArray[6] = nullGuardToString(tape.getBucketId());
+            bucketArray[7] = nullGuardToString(storageDomainName(tape));
+            bucketArray[8] = nullGuardFromDate(tape.getEjectDate(), DATE_FORMAT);
+            bucketArray[9] = nullGuard(tape.getEjectLocation());
+            bucketArray[10] = nullGuard(tape.getEjectLabel());
+            bucketArray[11] = nullGuardFromDate(tape.getEjectPending(), DATE_FORMAT);
             formatArray[i++] = bucketArray;
         }
         return formatArray;

ds3_java_cli/src/test/java/com/spectralogic/ds3cli/Ds3Cli_Test.java

@@ -2338,14 +2338,14 @@ public void getTapes() throws Exception {
         final String storageDoamin2Name = "Storage domain 2";
 
         final String expected =
-                "+----------+--------------------------------------+--------+--------------------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n" +
-                "| Bar Code |                  ID                  |  State |       Last Modified      | Available Raw Capacity |               BucketID               | Assigned to Storage Domain | Ejection Date | Ejection Location | Ejection Label | Ejection Pending |\n" +
-                "+----------+--------------------------------------+--------+--------------------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n" +
-                "| 121552L6 | 52741a53-24d5-4391-87a9-9cce703d7ed7 | NORMAL | 2016-06-29T20:24:35.000Z | 2408082046976          | N/A                                  | N/A                        | N/A           | N/A               | N/A            | N/A              |\n" +
-                "| 121553L6 | e9e2e2c8-813b-4adf-9ed9-c6f788084656 | NORMAL | 2016-07-18T03:04:30.000Z | 2407684636672          | 5f02264b-b344-4bdd-88bd-7e87133bb0c9 | " + storageDoamin1Name + "           | N/A           | N/A               | N/A            | N/A              |\n" +
-                "| 121555L6 | 8cb037d1-39aa-4f42-b27c-acbdf8b4c3c7 | NORMAL | 2016-06-29T20:18:44.000Z | 2408082046976          | N/A                                  | N/A                        | N/A           | N/A               | N/A            | N/A              |\n" +
-                "| 122104L6 | b16a8737-8801-4658-971c-c67d6ae44773 | NORMAL | 2016-07-18T03:07:26.000Z | 2407688830976          | 5f02264b-b344-4bdd-88bd-7e87133bb0c9 | " + storageDoamin2Name + "           | N/A           | N/A               | N/A            | N/A              |\n" +
-                "+----------+--------------------------------------+--------+--------------------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n";
+                "+----------+--------------------------------------+--------+--------------------------+---------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n" +
+                "| Bar Code |                  ID                  |  State |       Last Modified      | Last Verified | Available Raw Capacity |               BucketID               | Assigned to Storage Domain | Ejection Date | Ejection Location | Ejection Label | Ejection Pending |\n" +
+                "+----------+--------------------------------------+--------+--------------------------+---------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n" +
+                "| 121552L6 | 52741a53-24d5-4391-87a9-9cce703d7ed7 | NORMAL | 2016-06-29T20:24:35.000Z | N/A           | 2408082046976          | N/A                                  | N/A                        | N/A           | N/A               | N/A            | N/A              |\n" +
+                "| 121553L6 | e9e2e2c8-813b-4adf-9ed9-c6f788084656 | NORMAL | 2016-07-18T03:04:30.000Z | N/A           | 2407684636672          | 5f02264b-b344-4bdd-88bd-7e87133bb0c9 | " + storageDoamin1Name + "           | N/A           | N/A               | N/A            | N/A              |\n" +
+                "| 121555L6 | 8cb037d1-39aa-4f42-b27c-acbdf8b4c3c7 | NORMAL | 2016-06-29T20:18:44.000Z | N/A           | 2408082046976          | N/A                                  | N/A                        | N/A           | N/A               | N/A            | N/A              |\n" +
+                "| 122104L6 | b16a8737-8801-4658-971c-c67d6ae44773 | NORMAL | 2016-07-18T03:07:26.000Z | N/A           | 2407688830976          | 5f02264b-b344-4bdd-88bd-7e87133bb0c9 | " + storageDoamin2Name + "           | N/A           | N/A               | N/A            | N/A              |\n" +
+                "+----------+--------------------------------------+--------+--------------------------+---------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n";
 
         final InputStream packet = IOUtils.toInputStream("<Data><Tape>" +
                 "<AssignedToStorageDomain>false</AssignedToStorageDomain>" +
@@ -2440,11 +2440,11 @@ public void getTapesWithBucketId() throws Exception {
                 "</Data>", "utf-8");
 
         final String expected =
-                "+----------+--------------------------------------+--------+--------------------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n" +
-                "| Bar Code |                  ID                  |  State |       Last Modified      | Available Raw Capacity |               BucketID               | Assigned to Storage Domain | Ejection Date | Ejection Location | Ejection Label | Ejection Pending |\n" +
-                "+----------+--------------------------------------+--------+--------------------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n" +
-                "| 121552L6 | 52741a53-24d5-4391-87a9-9cce703d7ed7 | NORMAL | 2016-06-29T20:24:35.000Z | 2408082046976          | " + bucketId.toLowerCase() + " | N/A                        | N/A           | N/A               | N/A            | N/A              |\n" +
-                "+----------+--------------------------------------+--------+--------------------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n";
+                "+----------+--------------------------------------+--------+--------------------------+---------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n" +
+                "| Bar Code |                  ID                  |  State |       Last Modified      | Last Verified | Available Raw Capacity |               BucketID               | Assigned to Storage Domain | Ejection Date | Ejection Location | Ejection Label | Ejection Pending |\n" +
+                "+----------+--------------------------------------+--------+--------------------------+---------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n" +
+                "| 121552L6 | 52741a53-24d5-4391-87a9-9cce703d7ed7 | NORMAL | 2016-06-29T20:24:35.000Z | N/A           | 2408082046976          | " + bucketId.toLowerCase() + " | N/A                        | N/A           | N/A               | N/A            | N/A              |\n" +
+                "+----------+--------------------------------------+--------+--------------------------+---------------+------------------------+--------------------------------------+----------------------------+---------------+-------------------+----------------+------------------+\n";
 
         final TapeList tapes = XmlOutput.fromXml(packet, TapeList.class);