diff --git a/catalogue/CatalogueTest.cpp b/catalogue/CatalogueTest.cpp
index 391d1001e4d570335cbe0a6d19c046fa5f4849cf..fcf5cfcfbe04f4f381d837c988643338cdeeaa7d 100644
--- a/catalogue/CatalogueTest.cpp
+++ b/catalogue/CatalogueTest.cpp
@@ -237,6 +237,31 @@ std::map<std::string, cta::common::dataStructures::AdminHost> cta_catalogue_Cata
}
}
+//------------------------------------------------------------------------------
+// tapePoolListToMap
+//------------------------------------------------------------------------------
+std::map<std::string, cta::catalogue::TapePool> cta_catalogue_CatalogueTest::tapePoolListToMap(
+ const std::list<cta::catalogue::TapePool> &listOfTapePools) {
+ using namespace cta;
+
+ try {
+ std::map<std::string, cta::catalogue::TapePool> m;
+
+ for(auto &tapePool: listOfTapePools) {
+ if(m.end() != m.find(tapePool.name)) {
+ exception::Exception ex;
+ ex.getMessage() << "Tape pool " << tapePool.name << " is a duplicate";
+ throw ex;
+ }
+ m[tapePool.name] = tapePool;
+ }
+
+ return m;
+ } catch(exception::Exception &ex) {
+ throw exception::Exception(std::string(__FUNCTION__) + " failed: " + ex.getMessage().str());
+ }
+}
+
TEST_P(cta_catalogue_CatalogueTest, createAdminUser) {
using namespace cta;
@@ -5497,7 +5522,8 @@ TEST_P(cta_catalogue_CatalogueTest, fileWrittenToTape_many_archive_files) {
const std::string vid1 = "VID123";
const std::string vid2 = "VID456";
const std::string logicalLibraryName = "logical_library_name";
- const std::string tapePoolName = "tape_pool_name";
+ const std::string tapePoolName1 = "tape_pool_name_1";
+ const std::string tapePoolName2 = "tape_pool_name_2";
const uint64_t capacityInBytes = (uint64_t)10 * 1000 * 1000 * 1000 * 1000;
const bool disabledValue = true;
const bool fullValue = false;
@@ -5505,44 +5531,69 @@ TEST_P(cta_catalogue_CatalogueTest, fileWrittenToTape_many_archive_files) {
m_catalogue->createLogicalLibrary(m_admin, logicalLibraryName, "Create logical library");
- m_catalogue->createTapePool(m_admin, tapePoolName, 2, true, "Create tape pool");
+ m_catalogue->createTapePool(m_admin, tapePoolName1, 1, true, "Create tape pool");
{
const auto pools = m_catalogue->getTapePools();
ASSERT_EQ(1, pools.size());
- const auto &pool = pools.front();
- ASSERT_EQ(tapePoolName, pool.name);
+ auto tapePoolMap = tapePoolListToMap(pools);
+ auto tapePoolMapItor = tapePoolMap.find(tapePoolName1);
+ ASSERT_NE(tapePoolMapItor, tapePoolMap.end());
+ const auto &pool = tapePoolMapItor->second;
+
+ ASSERT_EQ(tapePoolName1, pool.name);
ASSERT_EQ(0, pool.nbTapes);
ASSERT_EQ(0, pool.capacityGigabytes);
ASSERT_EQ(0, pool.dataGigabytes);
}
- uint64_t totalCapacityInBytes = 0;
- m_catalogue->createTape(m_admin, vid1, logicalLibraryName, tapePoolName, capacityInBytes,
+ m_catalogue->createTapePool(m_admin, tapePoolName2, 1, true, "Create tape pool");
+ {
+ const auto pools = m_catalogue->getTapePools();
+ ASSERT_EQ(2, pools.size());
+
+ auto tapePoolMap = tapePoolListToMap(pools);
+ auto tapePoolMapItor = tapePoolMap.find(tapePoolName2);
+ ASSERT_NE(tapePoolMapItor, tapePoolMap.end());
+ const auto &pool = tapePoolMapItor->second;
+
+ ASSERT_EQ(tapePoolName2, pool.name);
+ ASSERT_EQ(0, pool.nbTapes);
+ ASSERT_EQ(0, pool.capacityGigabytes);
+ ASSERT_EQ(0, pool.dataGigabytes);
+ }
+
+ m_catalogue->createTape(m_admin, vid1, logicalLibraryName, tapePoolName1, capacityInBytes,
disabledValue, fullValue, comment);
- totalCapacityInBytes += capacityInBytes;
{
const auto pools = m_catalogue->getTapePools();
- ASSERT_EQ(1, pools.size());
+ ASSERT_EQ(2, pools.size());
- const auto &pool = pools.front();
- ASSERT_EQ(tapePoolName, pool.name);
+ auto tapePoolMap = tapePoolListToMap(pools);
+ auto tapePoolMapItor = tapePoolMap.find(tapePoolName1);
+ ASSERT_NE(tapePoolMapItor, tapePoolMap.end());
+ const auto &pool = tapePoolMapItor->second;
+
+ ASSERT_EQ(tapePoolName1, pool.name);
ASSERT_EQ(1, pool.nbTapes);
- ASSERT_EQ(totalCapacityInBytes/1000000000, pool.capacityGigabytes);
+ ASSERT_EQ(capacityInBytes/1000000000, pool.capacityGigabytes);
ASSERT_EQ(0, pool.dataGigabytes);
}
- m_catalogue->createTape(m_admin, vid2, logicalLibraryName, tapePoolName, capacityInBytes,
+ m_catalogue->createTape(m_admin, vid2, logicalLibraryName, tapePoolName2, capacityInBytes,
disabledValue, fullValue, comment);
- totalCapacityInBytes += capacityInBytes;
{
const auto pools = m_catalogue->getTapePools();
- ASSERT_EQ(1, pools.size());
+ ASSERT_EQ(2, pools.size());
- const auto &pool = pools.front();
- ASSERT_EQ(tapePoolName, pool.name);
- ASSERT_EQ(2, pool.nbTapes);
- ASSERT_EQ(totalCapacityInBytes/1000000000, pool.capacityGigabytes);
+ auto tapePoolMap = tapePoolListToMap(pools);
+ auto tapePoolMapItor = tapePoolMap.find(tapePoolName2);
+ ASSERT_NE(tapePoolMapItor, tapePoolMap.end());
+ const auto &pool = tapePoolMapItor->second;
+
+ ASSERT_EQ(tapePoolName2, pool.name);
+ ASSERT_EQ(1, pool.nbTapes);
+ ASSERT_EQ(capacityInBytes/1000000000, pool.capacityGigabytes);
ASSERT_EQ(0, pool.dataGigabytes);
}
@@ -5558,7 +5609,7 @@ TEST_P(cta_catalogue_CatalogueTest, fileWrittenToTape_many_archive_files) {
const common::dataStructures::Tape &tape = it->second;
ASSERT_EQ(vid1, tape.vid);
ASSERT_EQ(logicalLibraryName, tape.logicalLibraryName);
- ASSERT_EQ(tapePoolName, tape.tapePoolName);
+ ASSERT_EQ(tapePoolName1, tape.tapePoolName);
ASSERT_EQ(capacityInBytes, tape.capacityInBytes);
ASSERT_TRUE(disabledValue == tape.disabled);
ASSERT_TRUE(fullValue == tape.full);
@@ -5582,7 +5633,7 @@ TEST_P(cta_catalogue_CatalogueTest, fileWrittenToTape_many_archive_files) {
const auto &tape = it->second;
ASSERT_EQ(vid2, tape.vid);
ASSERT_EQ(logicalLibraryName, tape.logicalLibraryName);
- ASSERT_EQ(tapePoolName, tape.tapePoolName);
+ ASSERT_EQ(tapePoolName2, tape.tapePoolName);
ASSERT_EQ(capacityInBytes, tape.capacityInBytes);
ASSERT_TRUE(disabledValue == tape.disabled);
ASSERT_TRUE(fullValue == tape.full);
@@ -5617,7 +5668,6 @@ TEST_P(cta_catalogue_CatalogueTest, fileWrittenToTape_many_archive_files) {
const uint64_t archiveFileSize = 2 * 1000 * 1000 * 1000;
const uint64_t compressedFileSize = archiveFileSize;
- uint64_t totalCompressedFileSize = 0;
std::set<catalogue::TapeFileWritten> tapeFilesWrittenCopy1;
for(uint64_t i = 1; i <= nbArchiveFiles; i++) {
std::ostringstream diskFileId;
@@ -5645,19 +5695,21 @@ TEST_P(cta_catalogue_CatalogueTest, fileWrittenToTape_many_archive_files) {
fileWritten.copyNb = 1;
fileWritten.tapeDrive = tapeDrive;
tapeFilesWrittenCopy1.emplace(fileWritten);
-
- totalCompressedFileSize += compressedFileSize;
}
m_catalogue->filesWrittenToTape(tapeFilesWrittenCopy1);
{
const auto pools = m_catalogue->getTapePools();
- ASSERT_EQ(1, pools.size());
+ ASSERT_EQ(2, pools.size());
- const auto &pool = pools.front();
- ASSERT_EQ(tapePoolName, pool.name);
- ASSERT_EQ(2, pool.nbTapes);
- ASSERT_EQ(totalCapacityInBytes/1000000000, pool.capacityGigabytes);
- ASSERT_EQ(totalCompressedFileSize/1000000000, pool.dataGigabytes);
+ const auto tapePoolMap = tapePoolListToMap(pools);
+ auto tapePoolMapItor = tapePoolMap.find(tapePoolName1);
+ ASSERT_NE(tapePoolMapItor, tapePoolMap.end());
+ const auto &pool = tapePoolMapItor->second;
+
+ ASSERT_EQ(tapePoolName1, pool.name);
+ ASSERT_EQ(1, pool.nbTapes);
+ ASSERT_EQ(capacityInBytes/1000000000, pool.capacityGigabytes);
+ ASSERT_EQ(nbArchiveFiles * compressedFileSize/1000000000, pool.dataGigabytes);
}
{
@@ -5705,19 +5757,21 @@ TEST_P(cta_catalogue_CatalogueTest, fileWrittenToTape_many_archive_files) {
fileWritten.copyNb = 2;
fileWritten.tapeDrive = tapeDrive;
tapeFilesWrittenCopy2.emplace(fileWritten);
-
- totalCompressedFileSize += compressedFileSize;
}
m_catalogue->filesWrittenToTape(tapeFilesWrittenCopy2);
{
const auto pools = m_catalogue->getTapePools();
- ASSERT_EQ(1, pools.size());
+ ASSERT_EQ(2, pools.size());
- const auto &pool = pools.front();
- ASSERT_EQ(tapePoolName, pool.name);
- ASSERT_EQ(2, pool.nbTapes);
- ASSERT_EQ(totalCapacityInBytes/1000000000, pool.capacityGigabytes);
- ASSERT_EQ(totalCompressedFileSize/1000000000, pool.dataGigabytes);
+ const auto tapePoolMap = tapePoolListToMap(pools);
+ auto tapePoolMapItor = tapePoolMap.find(tapePoolName2);
+ ASSERT_NE(tapePoolMapItor, tapePoolMap.end());
+ const auto &pool = tapePoolMapItor->second;
+
+ ASSERT_EQ(tapePoolName2, pool.name);
+ ASSERT_EQ(1, pool.nbTapes);
+ ASSERT_EQ(capacityInBytes/1000000000, pool.capacityGigabytes);
+ ASSERT_EQ(nbArchiveFiles * compressedFileSize/1000000000, pool.dataGigabytes);
}
{
@@ -5749,7 +5803,7 @@ TEST_P(cta_catalogue_CatalogueTest, fileWrittenToTape_many_archive_files) {
searchCriteria.storageClass = storageClass.name;
searchCriteria.vid = vid1;
searchCriteria.tapeFileCopyNb = 1;
- searchCriteria.tapePool = tapePoolName;
+ searchCriteria.tapePool = tapePoolName1;
auto archiveFileItor = m_catalogue->getArchiveFiles(searchCriteria);
std::map<uint64_t, common::dataStructures::ArchiveFile> m = archiveFileItorToMap(archiveFileItor);
@@ -5988,15 +6042,28 @@ TEST_P(cta_catalogue_CatalogueTest, fileWrittenToTape_many_archive_files) {
{
catalogue::TapeFileSearchCriteria searchCriteria;
- searchCriteria.tapePool = "tape_pool_name";
+ searchCriteria.tapePool = tapePoolName1;
auto archiveFileItor = m_catalogue->getArchiveFiles(searchCriteria);
const auto m = archiveFileItorToMap(archiveFileItor);
ASSERT_EQ(nbArchiveFiles, m.size());
const common::dataStructures::ArchiveFileSummary summary = m_catalogue->getTapeFileSummary(searchCriteria);
- ASSERT_EQ(nbArchiveFiles * storageClass.nbCopies * archiveFileSize, summary.totalBytes);
- ASSERT_EQ(nbArchiveFiles * storageClass.nbCopies * compressedFileSize, summary.totalCompressedBytes);
- ASSERT_EQ(nbArchiveFiles * storageClass.nbCopies, summary.totalFiles);
+ ASSERT_EQ(nbArchiveFiles * archiveFileSize, summary.totalBytes);
+ ASSERT_EQ(nbArchiveFiles * compressedFileSize, summary.totalCompressedBytes);
+ ASSERT_EQ(nbArchiveFiles, summary.totalFiles);
+ }
+
+ {
+ catalogue::TapeFileSearchCriteria searchCriteria;
+ searchCriteria.tapePool = tapePoolName2;
+ auto archiveFileItor = m_catalogue->getArchiveFiles(searchCriteria);
+ const auto m = archiveFileItorToMap(archiveFileItor);
+ ASSERT_EQ(nbArchiveFiles, m.size());
+
+ const common::dataStructures::ArchiveFileSummary summary = m_catalogue->getTapeFileSummary(searchCriteria);
+ ASSERT_EQ(nbArchiveFiles * archiveFileSize, summary.totalBytes);
+ ASSERT_EQ(nbArchiveFiles * compressedFileSize, summary.totalCompressedBytes);
+ ASSERT_EQ(nbArchiveFiles, summary.totalFiles);
}
{
diff --git a/catalogue/CatalogueTest.hpp b/catalogue/CatalogueTest.hpp
index 2b9fcf6e2f2abbcf67e028d694ac41be617b3ba5..a421ae0a6972a02a05ac9f56353fbe175cd36087 100644
--- a/catalogue/CatalogueTest.hpp
+++ b/catalogue/CatalogueTest.hpp
@@ -92,6 +92,16 @@ protected:
*/
std::map<std::string, cta::common::dataStructures::AdminHost> adminHostListToMap(
const std::list<cta::common::dataStructures::AdminHost> &listOfAdminHosts);
+
+ /**
+ * Creates a map from tape pool name to tape pool from the specified list of
+ * tape pools.
+ *
+ * @param listOfTapePools The list of tape pools.
+ * @return Map from tape pool name to tape pool.
+ */
+ std::map<std::string, cta::catalogue::TapePool> tapePoolListToMap(
+ const std::list<cta::catalogue::TapePool> &listOfTapePools);
}; // cta_catalogue_CatalogueTest
} // namespace unitTests