Resolve "Allow VOL1 tape label to read Enstore tape labels"

ReleaseNotes.md

@@ -20,6 +20,7 @@ Please consult the [database upgrade documentation](https://eoscta.docs.cern.ch/
 - cta/CTA#1155 - Remove GCC suppresions in DriveGeneric and file/Structures
 - cta/CTA#1173 - Remove GCC '-Wno-unused-function' suppresion
 - cta/CTA#1166 - Add SCL-RH Repo to CTA CI boot scripts
+- cta/CTA#1185 - Make expectedLabelStandard default argument (for Enstore reads)
 
 ### Catalogue Schema
 - cta/CTA#1043 - Add verification column to tape table

tapeserver/castor/tape/tapeserver/file/Structures.cpp

@@ -36,14 +36,14 @@ void tapeFile::VOL1::fill(std::string VSN,
   setString(m_LBPMethod, hexLBP.str());
 }
 
-void tapeFile::VOL1::verify() {
+void tapeFile::VOL1::verify(const char *const expectedLblStandard) {
   if (cmpString(m_label, "VOL1"))
     throw cta::exception::Exception(std::string("Failed verify for the VOL1: ") +
           tapeFile::toString(m_label));
   if (!cmpString(m_VSN, ""))
     throw cta::exception::Exception(std::string("Failed verify for the VSN: ") +
           tapeFile::toString(m_VSN));
-  const char *const expectedLblStandard = "3";
+
   if (cmpString(m_lblStandard, expectedLblStandard))
     throw cta::exception::Exception(
           std::string("Failed verify for the label standard: expected=") +

tapeserver/castor/tape/tapeserver/file/Structures.hpp

@@ -121,7 +121,7 @@ namespace tape {
       /**
        * Throws an exception if the structure does not match expectations.
        */
-      void verify();
+      void verify(const char *const expectedLblStandard = "3");
     };
 
     class VOL1withCrc : public VOL1 {