Commit 46104174 authored by Daniele Kruse's avatar Daniele Kruse
Browse files

added authorization for administrative commands and removing security identity...

added authorization for administrative commands and removing security identity parameters from deleters and getters of the catalogue
parent 10e4e1a5
......@@ -77,44 +77,43 @@ public:
virtual void createBootstrapAdminAndHostNoAuth(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &hostName, const std::string &comment) = 0;
virtual void createAdminUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment) = 0;
virtual void deleteAdminUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user) = 0;
virtual std::list<cta::common::dataStructures::AdminUser> getAdminUsers(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void deleteAdminUser(const cta::common::dataStructures::UserIdentity &user) = 0;
virtual std::list<cta::common::dataStructures::AdminUser> getAdminUsers() const = 0;
virtual void modifyAdminUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment) = 0;
virtual void createAdminHost(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment) = 0;
virtual void deleteAdminHost(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName) = 0;
virtual std::list<cta::common::dataStructures::AdminHost> getAdminHosts(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void deleteAdminHost(const std::string &hostName) = 0;
virtual std::list<cta::common::dataStructures::AdminHost> getAdminHosts() const = 0;
virtual void modifyAdminHostComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment) = 0;
virtual void createStorageClass(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies, const std::string &comment) = 0;
virtual void deleteStorageClass(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::StorageClass> getStorageClasses(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void deleteStorageClass(const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::StorageClass> getStorageClasses() const = 0;
virtual void modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies) = 0;
virtual void modifyStorageClassComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) = 0;
virtual void createTapePool(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes, const bool encryptionValue, const std::string &comment) = 0;
virtual void deleteTapePool(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::TapePool> getTapePools(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void deleteTapePool(const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::TapePool> getTapePools() const = 0;
virtual void modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes) = 0;
virtual void modifyTapePoolComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) = 0;
virtual void setTapePoolEncryption(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const bool encryptionValue) = 0;
virtual void createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName, const std::string &comment) = 0;
virtual void deleteArchiveRoute(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb) = 0;
virtual std::list<cta::common::dataStructures::ArchiveRoute> getArchiveRoutes(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void deleteArchiveRoute(const std::string &storageClassName, const uint64_t copyNb) = 0;
virtual std::list<cta::common::dataStructures::ArchiveRoute> getArchiveRoutes() const = 0;
virtual void modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName) = 0;
virtual void modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment) = 0;
virtual void createLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) = 0;
virtual void deleteLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::LogicalLibrary> getLogicalLibraries(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void deleteLogicalLibrary(const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::LogicalLibrary> getLogicalLibraries() const = 0;
virtual void modifyLogicalLibraryComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) = 0;
virtual void createTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &encryptionKey, const uint64_t capacityInBytes, const bool disabledValue, const bool fullValue, const std::string &comment) = 0;
virtual void deleteTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid) = 0;
virtual std::list<cta::common::dataStructures::Tape> getTapes(const cta::common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
virtual void deleteTape(const std::string &vid) = 0;
virtual std::list<cta::common::dataStructures::Tape> getTapes(const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue, const std::string &lbpValue) = 0;
virtual void reclaimTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid) = 0;
virtual void modifyTapeLogicalLibraryName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName) = 0;
......@@ -131,16 +130,16 @@ public:
virtual void modifyTapeComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &comment) = 0;
virtual void createUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup, const std::string &comment) = 0;
virtual void deleteUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group) = 0;
virtual std::list<cta::common::dataStructures::User> getUsers(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void deleteUser(const std::string &name, const std::string &group) = 0;
virtual std::list<cta::common::dataStructures::User> getUsers() const = 0;
virtual void modifyUserMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup) = 0;
virtual void modifyUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &comment) = 0;
virtual void createMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority, const uint64_t minArchiveFilesQueued,
const uint64_t minArchiveBytesQueued, const uint64_t minArchiveRequestAge, const uint64_t retrievePriority, const uint64_t minRetrieveFilesQueued,
const uint64_t minRetrieveBytesQueued, const uint64_t minRetrieveRequestAge, const uint64_t maxDrivesAllowed, const std::string &comment) = 0;
virtual void deleteMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::MountGroup> getMountGroups(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void deleteMountGroup(const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::MountGroup> getMountGroups() const = 0;
virtual void modifyMountGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority) = 0;
virtual void modifyMountGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued) = 0;
virtual void modifyMountGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveBytesQueued) = 0;
......@@ -154,8 +153,8 @@ public:
virtual void createDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType, const std::string &mountGroup,
const std::string &tag, const std::string &vid, const uint64_t fromTimestamp, const uint64_t untilTimestamp,const std::string &comment) = 0;
virtual void deleteDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename) = 0;
virtual std::list<cta::common::dataStructures::Dedication> getDedications(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void deleteDedication(const std::string &drivename) = 0;
virtual std::list<cta::common::dataStructures::Dedication> getDedications() const = 0;
virtual void modifyDedicationType(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType) = 0;
virtual void modifyDedicationMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &mountGroup) = 0;
virtual void modifyDedicationTag(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &tag) = 0;
......@@ -164,9 +163,9 @@ public:
virtual void modifyDedicationUntil(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t untilTimestamp) = 0;
virtual void modifyDedicationComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &comment) = 0;
virtual std::list<cta::common::dataStructures::ArchiveFile> getArchiveFiles(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const uint64_t id, const std::string &eosid,
virtual std::list<cta::common::dataStructures::ArchiveFile> getArchiveFiles(const uint64_t id, const std::string &eosid,
const std::string &copynb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) = 0;
virtual cta::common::dataStructures::ArchiveFileSummary getArchiveFileSummary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const uint64_t id, const std::string &eosid,
virtual cta::common::dataStructures::ArchiveFileSummary getArchiveFileSummary(const uint64_t id, const std::string &eosid,
const std::string &copynb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) = 0;
virtual cta::common::dataStructures::ArchiveFile getArchiveFileById(const uint64_t id) = 0;
......
......@@ -38,12 +38,12 @@ void cta::catalogue::DummyCatalogue::createAdminUser(const cta::common::dataStru
//------------------------------------------------------------------------------
// deleteAdminUser
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteAdminUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user) {}
void cta::catalogue::DummyCatalogue::deleteAdminUser(const cta::common::dataStructures::UserIdentity &user) {}
//------------------------------------------------------------------------------
// getAdminUsers
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::AdminUser> cta::catalogue::DummyCatalogue::getAdminUsers(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::AdminUser>();}
std::list<cta::common::dataStructures::AdminUser> cta::catalogue::DummyCatalogue::getAdminUsers() const { return std::list<cta::common::dataStructures::AdminUser>();}
//------------------------------------------------------------------------------
// modifyAdminUserComment
......@@ -58,12 +58,12 @@ void cta::catalogue::DummyCatalogue::createAdminHost(const cta::common::dataStru
//------------------------------------------------------------------------------
// deleteAdminHost
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteAdminHost(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName) {}
void cta::catalogue::DummyCatalogue::deleteAdminHost(const std::string &hostName) {}
//------------------------------------------------------------------------------
// getAdminHosts
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::AdminHost> cta::catalogue::DummyCatalogue::getAdminHosts(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::AdminHost>();}
std::list<cta::common::dataStructures::AdminHost> cta::catalogue::DummyCatalogue::getAdminHosts() const { return std::list<cta::common::dataStructures::AdminHost>();}
//------------------------------------------------------------------------------
// modifyAdminHostComment
......@@ -78,12 +78,12 @@ void cta::catalogue::DummyCatalogue::createStorageClass(const cta::common::dataS
//------------------------------------------------------------------------------
// deleteStorageClass
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteStorageClass(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
void cta::catalogue::DummyCatalogue::deleteStorageClass(const std::string &name) {}
//------------------------------------------------------------------------------
// getStorageClasses
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::StorageClass> cta::catalogue::DummyCatalogue::getStorageClasses(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::StorageClass>();}
std::list<cta::common::dataStructures::StorageClass> cta::catalogue::DummyCatalogue::getStorageClasses() const { return std::list<cta::common::dataStructures::StorageClass>();}
//------------------------------------------------------------------------------
// modifyStorageClassNbCopies
......@@ -103,12 +103,12 @@ void cta::catalogue::DummyCatalogue::createTapePool(const cta::common::dataStruc
//------------------------------------------------------------------------------
// deleteTapePool
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteTapePool(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
void cta::catalogue::DummyCatalogue::deleteTapePool(const std::string &name) {}
//------------------------------------------------------------------------------
// getTapePools
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::TapePool> cta::catalogue::DummyCatalogue::getTapePools(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::TapePool>();}
std::list<cta::common::dataStructures::TapePool> cta::catalogue::DummyCatalogue::getTapePools() const { return std::list<cta::common::dataStructures::TapePool>();}
//------------------------------------------------------------------------------
// modifyTapePoolNbPartialTapes
......@@ -133,12 +133,12 @@ void cta::catalogue::DummyCatalogue::createArchiveRoute(const cta::common::dataS
//------------------------------------------------------------------------------
// deleteArchiveRoute
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteArchiveRoute(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb) {}
void cta::catalogue::DummyCatalogue::deleteArchiveRoute(const std::string &storageClassName, const uint64_t copyNb) {}
//------------------------------------------------------------------------------
// getArchiveRoutes
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::ArchiveRoute> cta::catalogue::DummyCatalogue::getArchiveRoutes(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::ArchiveRoute>();}
std::list<cta::common::dataStructures::ArchiveRoute> cta::catalogue::DummyCatalogue::getArchiveRoutes() const { return std::list<cta::common::dataStructures::ArchiveRoute>();}
//------------------------------------------------------------------------------
// modifyArchiveRouteTapePoolName
......@@ -158,12 +158,12 @@ void cta::catalogue::DummyCatalogue::createLogicalLibrary(const cta::common::dat
//------------------------------------------------------------------------------
// deleteLogicalLibrary
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
void cta::catalogue::DummyCatalogue::deleteLogicalLibrary(const std::string &name) {}
//------------------------------------------------------------------------------
// getLogicalLibraries
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::LogicalLibrary> cta::catalogue::DummyCatalogue::getLogicalLibraries(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::LogicalLibrary>();}
std::list<cta::common::dataStructures::LogicalLibrary> cta::catalogue::DummyCatalogue::getLogicalLibraries() const { return std::list<cta::common::dataStructures::LogicalLibrary>();}
//------------------------------------------------------------------------------
// modifyLogicalLibraryComment
......@@ -179,13 +179,12 @@ void cta::catalogue::DummyCatalogue::createTape(const cta::common::dataStructure
//------------------------------------------------------------------------------
// deleteTape
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid) {}
void cta::catalogue::DummyCatalogue::deleteTape(const std::string &vid) {}
//------------------------------------------------------------------------------
// getTapes
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::Tape> cta::catalogue::DummyCatalogue::getTapes(const cta::common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
std::list<cta::common::dataStructures::Tape> cta::catalogue::DummyCatalogue::getTapes(const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue, const std::string &lbpValue) { return std::list<cta::common::dataStructures::Tape>();}
//------------------------------------------------------------------------------
......@@ -261,12 +260,12 @@ void cta::catalogue::DummyCatalogue::createUser(const cta::common::dataStructure
//------------------------------------------------------------------------------
// deleteUser
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group) {}
void cta::catalogue::DummyCatalogue::deleteUser(const std::string &name, const std::string &group) {}
//------------------------------------------------------------------------------
// getUsers
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::User> cta::catalogue::DummyCatalogue::getUsers(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::User>();}
std::list<cta::common::dataStructures::User> cta::catalogue::DummyCatalogue::getUsers() const { return std::list<cta::common::dataStructures::User>();}
//------------------------------------------------------------------------------
// modifyUserMountGroup
......@@ -288,12 +287,12 @@ void cta::catalogue::DummyCatalogue::createMountGroup(const cta::common::dataStr
//------------------------------------------------------------------------------
// deleteMountGroup
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
void cta::catalogue::DummyCatalogue::deleteMountGroup(const std::string &name) {}
//------------------------------------------------------------------------------
// getMountGroups
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::MountGroup> cta::catalogue::DummyCatalogue::getMountGroups(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::MountGroup>();}
std::list<cta::common::dataStructures::MountGroup> cta::catalogue::DummyCatalogue::getMountGroups() const { return std::list<cta::common::dataStructures::MountGroup>();}
//------------------------------------------------------------------------------
// modifyMountGroupArchivePriority
......@@ -354,12 +353,12 @@ void cta::catalogue::DummyCatalogue::createDedication(const cta::common::dataStr
//------------------------------------------------------------------------------
// deleteDedication
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename) {}
void cta::catalogue::DummyCatalogue::deleteDedication(const std::string &drivename) {}
//------------------------------------------------------------------------------
// getDedications
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::Dedication> cta::catalogue::DummyCatalogue::getDedications(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::Dedication>();}
std::list<cta::common::dataStructures::Dedication> cta::catalogue::DummyCatalogue::getDedications() const { return std::list<cta::common::dataStructures::Dedication>();}
//------------------------------------------------------------------------------
// modifyDedicationType
......@@ -399,7 +398,7 @@ void cta::catalogue::DummyCatalogue::modifyDedicationComment(const cta::common::
//------------------------------------------------------------------------------
// getArchiveFiles
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::ArchiveFile> cta::catalogue::DummyCatalogue::getArchiveFiles(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const uint64_t id, const std::string &eosid,
std::list<cta::common::dataStructures::ArchiveFile> cta::catalogue::DummyCatalogue::getArchiveFiles(const uint64_t id, const std::string &eosid,
const std::string &copynb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) {
return std::list<cta::common::dataStructures::ArchiveFile>();
}
......@@ -407,7 +406,7 @@ std::list<cta::common::dataStructures::ArchiveFile> cta::catalogue::DummyCatalog
//------------------------------------------------------------------------------
// getArchiveFileSummary
//------------------------------------------------------------------------------
cta::common::dataStructures::ArchiveFileSummary cta::catalogue::DummyCatalogue::getArchiveFileSummary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const uint64_t id, const std::string &eosid,
cta::common::dataStructures::ArchiveFileSummary cta::catalogue::DummyCatalogue::getArchiveFileSummary(const uint64_t id, const std::string &eosid,
const std::string &copynb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) {
return cta::common::dataStructures::ArchiveFileSummary();
}
......
......@@ -37,44 +37,43 @@ public:
virtual void createBootstrapAdminAndHostNoAuth(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &hostName, const std::string &comment);
virtual void createAdminUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment);
virtual void deleteAdminUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user);
virtual std::list<cta::common::dataStructures::AdminUser> getAdminUsers(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void deleteAdminUser(const cta::common::dataStructures::UserIdentity &user);
virtual std::list<cta::common::dataStructures::AdminUser> getAdminUsers() const;
virtual void modifyAdminUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment);
virtual void createAdminHost(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment);
virtual void deleteAdminHost(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName);
virtual std::list<cta::common::dataStructures::AdminHost> getAdminHosts(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void deleteAdminHost(const std::string &hostName);
virtual std::list<cta::common::dataStructures::AdminHost> getAdminHosts() const;
virtual void modifyAdminHostComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment);
virtual void createStorageClass(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies, const std::string &comment);
virtual void deleteStorageClass(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name);
virtual std::list<cta::common::dataStructures::StorageClass> getStorageClasses(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void deleteStorageClass(const std::string &name);
virtual std::list<cta::common::dataStructures::StorageClass> getStorageClasses() const;
virtual void modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies);
virtual void modifyStorageClassComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
virtual void createTapePool(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes, const bool encryptionValue, const std::string &comment);
virtual void deleteTapePool(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name);
virtual std::list<cta::common::dataStructures::TapePool> getTapePools(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void deleteTapePool(const std::string &name);
virtual std::list<cta::common::dataStructures::TapePool> getTapePools() const;
virtual void modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes);
virtual void modifyTapePoolComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
virtual void setTapePoolEncryption(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const bool encryptionValue);
virtual void createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName, const std::string &comment);
virtual void deleteArchiveRoute(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb);
virtual std::list<cta::common::dataStructures::ArchiveRoute> getArchiveRoutes(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void deleteArchiveRoute(const std::string &storageClassName, const uint64_t copyNb);
virtual std::list<cta::common::dataStructures::ArchiveRoute> getArchiveRoutes() const;
virtual void modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName);
virtual void modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment);
virtual void createLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
virtual void deleteLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name);
virtual std::list<cta::common::dataStructures::LogicalLibrary> getLogicalLibraries(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void deleteLogicalLibrary(const std::string &name);
virtual std::list<cta::common::dataStructures::LogicalLibrary> getLogicalLibraries() const;
virtual void modifyLogicalLibraryComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
virtual void createTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &encryptionKey, const uint64_t capacityInBytes, const bool disabledValue, const bool fullValue, const std::string &comment);
virtual void deleteTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid);
virtual std::list<cta::common::dataStructures::Tape> getTapes(const cta::common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
virtual void deleteTape(const std::string &vid);
virtual std::list<cta::common::dataStructures::Tape> getTapes(const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue, const std::string &lbpValue);
virtual void reclaimTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid);
virtual void modifyTapeLogicalLibraryName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName);
......@@ -91,16 +90,16 @@ public:
virtual void modifyTapeComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &comment);
virtual void createUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup, const std::string &comment);
virtual void deleteUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group);
virtual std::list<cta::common::dataStructures::User> getUsers(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void deleteUser(const std::string &name, const std::string &group);
virtual std::list<cta::common::dataStructures::User> getUsers() const;
virtual void modifyUserMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup);
virtual void modifyUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &comment);
virtual void createMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority, const uint64_t minArchiveFilesQueued,
const uint64_t minArchiveBytesQueued, const uint64_t minArchiveRequestAge, const uint64_t retrievePriority, const uint64_t minRetrieveFilesQueued,
const uint64_t minRetrieveBytesQueued, const uint64_t minRetrieveRequestAge, const uint64_t maxDrivesAllowed, const std::string &comment);
virtual void deleteMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name);
virtual std::list<cta::common::dataStructures::MountGroup> getMountGroups(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void deleteMountGroup(const std::string &name);
virtual std::list<cta::common::dataStructures::MountGroup> getMountGroups() const;
virtual void modifyMountGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority);
virtual void modifyMountGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued);
virtual void modifyMountGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveBytesQueued);
......@@ -114,8 +113,8 @@ public:
virtual void createDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType, const std::string &mountGroup,
const std::string &tag, const std::string &vid, const uint64_t fromTimestamp, const uint64_t untilTimestamp,const std::string &comment);
virtual void deleteDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename);
virtual std::list<cta::common::dataStructures::Dedication> getDedications(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void deleteDedication(const std::string &drivename);
virtual std::list<cta::common::dataStructures::Dedication> getDedications() const;
virtual void modifyDedicationType(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType);
virtual void modifyDedicationMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &mountGroup);
virtual void modifyDedicationTag(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &tag);
......@@ -124,9 +123,9 @@ public:
virtual void modifyDedicationUntil(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t untilTimestamp);
virtual void modifyDedicationComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &comment);
virtual std::list<cta::common::dataStructures::ArchiveFile> getArchiveFiles(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const uint64_t id, const std::string &eosid,
virtual std::list<cta::common::dataStructures::ArchiveFile> getArchiveFiles(const uint64_t id, const std::string &eosid,
const std::string &copynb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path);
virtual cta::common::dataStructures::ArchiveFileSummary getArchiveFileSummary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const uint64_t id, const std::string &eosid,
virtual cta::common::dataStructures::ArchiveFileSummary getArchiveFileSummary(const uint64_t id, const std::string &eosid,
const std::string &copynb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path);
virtual cta::common::dataStructures::ArchiveFile getArchiveFileById(const uint64_t id);
......
......@@ -217,14 +217,13 @@ void cta::catalogue::SqliteCatalogue::createAdminUser(
//------------------------------------------------------------------------------
// deleteAdminUser
//------------------------------------------------------------------------------
void cta::catalogue::SqliteCatalogue::deleteAdminUser(const common::dataStructures::SecurityIdentity &cliIdentity, const common::dataStructures::UserIdentity &user) {}
void cta::catalogue::SqliteCatalogue::deleteAdminUser(const common::dataStructures::UserIdentity &user) {}
//------------------------------------------------------------------------------
// getAdminUsers
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::AdminUser>
cta::catalogue::SqliteCatalogue::getAdminUsers(
const common::dataStructures::SecurityIdentity &requester) const {
cta::catalogue::SqliteCatalogue::getAdminUsers() const {
std::list<common::dataStructures::AdminUser> admins;
const char *const sql =
"SELECT "
......@@ -312,12 +311,12 @@ void cta::catalogue::SqliteCatalogue::createAdminHost(
//------------------------------------------------------------------------------
// deleteAdminHost
//------------------------------------------------------------------------------
void cta::catalogue::SqliteCatalogue::deleteAdminHost(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName) {}
void cta::catalogue::SqliteCatalogue::deleteAdminHost(const std::string &hostName) {}
//------------------------------------------------------------------------------
// getAdminHosts
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::AdminHost> cta::catalogue::SqliteCatalogue::getAdminHosts(const common::dataStructures::SecurityIdentity &requester) const {
std::list<cta::common::dataStructures::AdminHost> cta::catalogue::SqliteCatalogue::getAdminHosts() const {
std::list<common::dataStructures::AdminHost> hosts;
const char *const sql =
"SELECT "
......@@ -386,12 +385,12 @@ void cta::catalogue::SqliteCatalogue::createStorageClass(const common::dataStruc
//------------------------------------------------------------------------------
// deleteStorageClass
//------------------------------------------------------------------------------
void cta::catalogue::SqliteCatalogue::deleteStorageClass(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
void cta::catalogue::SqliteCatalogue::deleteStorageClass(const std::string &name) {}
//------------------------------------------------------------------------------
// getStorageClasses
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::StorageClass> cta::catalogue::SqliteCatalogue::getStorageClasses(const common::dataStructures::SecurityIdentity &requester) const { return std::list<cta::common::dataStructures::StorageClass>();}
std::list<cta::common::dataStructures::StorageClass> cta::catalogue::SqliteCatalogue::getStorageClasses() const { return std::list<cta::common::dataStructures::StorageClass>();}
//------------------------------------------------------------------------------
// modifyStorageClassNbCopies
......@@ -411,12 +410,12 @@ void cta::catalogue::SqliteCatalogue::createTapePool(const cta::common::dataStru
//------------------------------------------------------------------------------
// deleteTapePool
//------------------------------------------------------------------------------
void cta::catalogue::SqliteCatalogue::deleteTapePool(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
void cta::catalogue::SqliteCatalogue::deleteTapePool(const std::string &name) {}
//------------------------------------------------------------------------------
// getTapePools
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::TapePool> cta::catalogue::SqliteCatalogue::getTapePools(const common::dataStructures::SecurityIdentity &requester) const { return std::list<cta::common::dataStructures::TapePool>();}
std::list<cta::common::dataStructures::TapePool> cta::catalogue::SqliteCatalogue::getTapePools() const { return std::list<cta::common::dataStructures::TapePool>();}
//------------------------------------------------------------------------------
// modifyTapePoolNbPartialTapes
......@@ -441,12 +440,12 @@ void cta::catalogue::SqliteCatalogue::createArchiveRoute(const common::dataStruc
//------------------------------------------------------------------------------
// deleteArchiveRoute
//------------------------------------------------------------------------------
void cta::catalogue::SqliteCatalogue::deleteArchiveRoute(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb) {}
void cta::catalogue::SqliteCatalogue::deleteArchiveRoute(const std::string &storageClassName, const uint64_t copyNb) {}
//------------------------------------------------------------------------------
// getArchiveRoutes
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::ArchiveRoute> cta::catalogue::SqliteCatalogue::getArchiveRoutes(const common::dataStructures::SecurityIdentity &requester) const { return std::list<cta::common::dataStructures::ArchiveRoute>();}
std::list<cta::common::dataStructures::ArchiveRoute> cta::catalogue::SqliteCatalogue::getArchiveRoutes() const { return std::list<cta::common::dataStructures::ArchiveRoute>();}
//------------------------------------------------------------------------------
// modifyArchiveRouteTapePoolName
......@@ -466,12 +465,12 @@ void cta::catalogue::SqliteCatalogue::createLogicalLibrary(const common::dataStr
//------------------------------------------------------------------------------
// deleteLogicalLibrary
//------------------------------------------------------------------------------
void cta::catalogue::SqliteCatalogue::deleteLogicalLibrary(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
void cta::catalogue::SqliteCatalogue::deleteLogicalLibrary(const std::string &name) {}
//------------------------------------------------------------------------------
// getLogicalLibraries
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::LogicalLibrary> cta::catalogue::SqliteCatalogue::getLogicalLibraries(const common::dataStructures::SecurityIdentity &requester) const { return std::list<cta::common::dataStructures::LogicalLibrary>();}
std::list<cta::common::dataStructures::LogicalLibrary> cta::catalogue::SqliteCatalogue::getLogicalLibraries() const { return std::list<cta::common::dataStructures::LogicalLibrary>();}
//------------------------------------------------------------------------------
// modifyLogicalLibraryComment
......@@ -487,13 +486,12 @@ void cta::catalogue::SqliteCatalogue::createTape(const cta::common::dataStructur
//------------------------------------------------------------------------------
// deleteTape
//------------------------------------------------------------------------------
void cta::catalogue::SqliteCatalogue::deleteTape(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid) {}
void cta::catalogue::SqliteCatalogue::deleteTape(const std::string &vid) {}
//------------------------------------------------------------------------------
// getTapes
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::Tape> cta::catalogue::SqliteCatalogue::getTapes(const cta::common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
std::list<cta::common::dataStructures::Tape> cta::catalogue::SqliteCatalogue::getTapes(const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue, const std::string &lbpValue) { return std::list<cta::common::dataStructures::Tape>();}
//------------------------------------------------------------------------------
......@@ -569,12 +567,12 @@ void cta::catalogue::SqliteCatalogue::createUser(const common::dataStructures::S
//------------------------------------------------------------------------------
// deleteUser
//------------------------------------------------------------------------------
void cta::catalogue::SqliteCatalogue::deleteUser(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group) {}
void cta::catalogue::SqliteCatalogue::deleteUser(const std::string &name, const std::string &group) {}
//------------------------------------------------------------------------------
// getUsers
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::User> cta::catalogue::SqliteCatalogue::getUsers(const common::dataStructures::SecurityIdentity &requester) const { return std::list<cta::common::dataStructures::User>();}
std::list<cta::common::dataStructures::User> cta::catalogue::SqliteCatalogue::getUsers() const { return std::list<cta::common::dataStructures::User>();}
//------------------------------------------------------------------------------
// modifyUserMountGroup
......@@ -596,12 +594,12 @@ void cta::catalogue::SqliteCatalogue::createMountGroup(const common::dataStructu
//------------------------------------------------------------------------------
// deleteMountGroup
//------------------------------------------------------------------------------
void cta::catalogue::SqliteCatalogue::deleteMountGroup(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
void cta::catalogue::SqliteCatalogue::deleteMountGroup(const std::string &name) {}
//------------------------------------------------------------------------------
// getMountGroups
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::MountGroup