Skip to content
GitLab
Commit 6f01b27b authored by Daniele Kruse's avatar Daniele Kruse
Browse files

More work on CLI, plus changed all ints to be uint64_t

parent ff1db4d3
Expand all Hide whitespace changes
Inline Side-by-side
catalogue/Catalogue.hpp
View file @ 6f01b27b
......@@ -89,23 +89,23 @@ public:
virtual std::list<cta::common::dataStructures::AdminHost> getAdminHosts(const cta::common::dataStructures::SecurityIdentity &requester) const = 0;
virtual void modifyAdminHostComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &hostName, const std::string &comment) = 0;
virtual void createStorageClass(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint16_t nbCopies, const std::string &comment) = 0;
virtual void createStorageClass(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbCopies, const std::string &comment) = 0;
virtual void deleteStorageClass(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::StorageClass> getStorageClasses(const cta::common::dataStructures::SecurityIdentity &requester) const = 0;
virtual void modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint16_t nbCopies) = 0;
virtual void modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbCopies) = 0;
virtual void modifyStorageClassComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &comment) = 0;
virtual void createTapePool(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t nbPartialTapes, const std::string &comment) = 0;
virtual void createTapePool(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbPartialTapes, const std::string &comment) = 0;
virtual void deleteTapePool(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::TapePool> getTapePools(const cta::common::dataStructures::SecurityIdentity &requester) const = 0;
virtual void modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t nbPartialTapes) = 0;
virtual void modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbPartialTapes) = 0;
virtual void modifyTapePoolComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &comment) = 0;
virtual void createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &tapePoolName, const std::string &comment) = 0;
virtual void deleteArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb) = 0;
virtual void createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, 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 &requester, const std::string &storageClassName, const uint64_t copyNb) = 0;
virtual std::list<cta::common::dataStructures::ArchiveRoute> getArchiveRoutes(const cta::common::dataStructures::SecurityIdentity &requester) const = 0;
virtual void modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &tapePoolName) = 0;
virtual void modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &comment) = 0;
virtual void modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName) = 0;
virtual void modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment) = 0;
virtual void createLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &comment) = 0;
virtual void deleteLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name) = 0;
......@@ -134,20 +134,20 @@ public:
virtual void modifyUserUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &group, const std::string &userGroup) = 0;
virtual void modifyUserComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &group, const std::string &comment) = 0;
virtual void createUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t archivePriority, const uint64_t minArchiveFilesQueued,
const uint64_t minArchiveBytesQueued, const uint64_t minArchiveRequestAge, const uint32_t retrievePriority, const uint64_t minRetrieveFilesQueued,
const uint64_t minRetrieveBytesQueued, const uint64_t minRetrieveRequestAge, const uint16_t maxDrivesAllowed, const std::string &comment) = 0;
virtual void createUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, 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 deleteUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::UserGroup> getUserGroups(const cta::common::dataStructures::SecurityIdentity &requester) const = 0;
virtual void modifyUserGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t archivePriority) = 0;
virtual void modifyUserGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t archivePriority) = 0;
virtual void modifyUserGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minArchiveFilesQueued) = 0;
virtual void modifyUserGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minArchiveBytesQueued) = 0;
virtual void modifyUserGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minArchiveRequestAge) = 0;
virtual void modifyUserGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t retrievePriority) = 0;
virtual void modifyUserGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t retrievePriority) = 0;
virtual void modifyUserGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minRetrieveFilesQueued) = 0;
virtual void modifyUserGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minRetrieveBytesQueued) = 0;
virtual void modifyUserGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minRetrieveRequestAge) = 0;
virtual void modifyUserGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint16_t maxDrivesAllowed) = 0;
virtual void modifyUserGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t maxDrivesAllowed) = 0;
virtual void modifyUserGroupComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &comment) = 0;
virtual void createDedication(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &drivename, const bool readonly, const bool writeonly, const std::string &userGroup,
......
catalogue/MockCatalogue.cpp
View file @ 6f01b27b
......@@ -92,7 +92,7 @@ void cta::catalogue::MockCatalogue::modifyAdminHostComment(const cta::common::da
//------------------------------------------------------------------------------
// createStorageClass
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::createStorageClass(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint16_t nbCopies, const std::string &comment) {}
void cta::catalogue::MockCatalogue::createStorageClass(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbCopies, const std::string &comment) {}
//------------------------------------------------------------------------------
// deleteStorageClass
......@@ -107,7 +107,7 @@ std::list<cta::common::dataStructures::StorageClass> cta::catalogue::MockCatalog
//------------------------------------------------------------------------------
// modifyStorageClassNbCopies
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint16_t nbCopies) {}
void cta::catalogue::MockCatalogue::modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbCopies) {}
//------------------------------------------------------------------------------
// modifyStorageClassComment
......@@ -117,7 +117,7 @@ void cta::catalogue::MockCatalogue::modifyStorageClassComment(const cta::common:
//------------------------------------------------------------------------------
// createTapePool
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::createTapePool(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t nbPartialTapes, const std::string &comment) {}
void cta::catalogue::MockCatalogue::createTapePool(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbPartialTapes, const std::string &comment) {}
//------------------------------------------------------------------------------
// deleteTapePool
......@@ -132,7 +132,7 @@ std::list<cta::common::dataStructures::TapePool> cta::catalogue::MockCatalogue::
//------------------------------------------------------------------------------
// modifyTapePoolNbPartialTapes
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t nbPartialTapes) {}
void cta::catalogue::MockCatalogue::modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbPartialTapes) {}
//------------------------------------------------------------------------------
// modifyTapePoolComment
......@@ -142,12 +142,12 @@ void cta::catalogue::MockCatalogue::modifyTapePoolComment(const cta::common::dat
//------------------------------------------------------------------------------
// createArchiveRoute
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &tapePoolName, const std::string &comment) {}
void cta::catalogue::MockCatalogue::createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName, const std::string &comment) {}
//------------------------------------------------------------------------------
// deleteArchiveRoute
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::deleteArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb) {}
void cta::catalogue::MockCatalogue::deleteArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb) {}
//------------------------------------------------------------------------------
// getArchiveRoutes
......@@ -157,12 +157,12 @@ std::list<cta::common::dataStructures::ArchiveRoute> cta::catalogue::MockCatalog
//------------------------------------------------------------------------------
// modifyArchiveRouteTapePoolName
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &tapePoolName) {}
void cta::catalogue::MockCatalogue::modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName) {}
//------------------------------------------------------------------------------
// modifyArchiveRouteComment
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &comment) {}
void cta::catalogue::MockCatalogue::modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment) {}
//------------------------------------------------------------------------------
// createLogicalLibrary
......@@ -275,9 +275,9 @@ void cta::catalogue::MockCatalogue::modifyUserComment(const cta::common::dataStr
//------------------------------------------------------------------------------
// createUserGroup
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::createUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t archivePriority, const uint64_t minArchiveFilesQueued,
const uint64_t minArchiveBytesQueued, const uint64_t minArchiveRequestAge, const uint32_t retrievePriority, const uint64_t minRetrieveFilesQueued,
const uint64_t minRetrieveBytesQueued, const uint64_t minRetrieveRequestAge, const uint16_t maxDrivesAllowed, const std::string &comment) {}
void cta::catalogue::MockCatalogue::createUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, 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) {}
//------------------------------------------------------------------------------
// deleteUserGroup
......@@ -292,7 +292,7 @@ std::list<cta::common::dataStructures::UserGroup> cta::catalogue::MockCatalogue:
//------------------------------------------------------------------------------
// modifyUserGroupArchivePriority
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::modifyUserGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t archivePriority) {}
void cta::catalogue::MockCatalogue::modifyUserGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t archivePriority) {}
//------------------------------------------------------------------------------
// modifyUserGroupArchiveMinFilesQueued
......@@ -312,7 +312,7 @@ void cta::catalogue::MockCatalogue::modifyUserGroupArchiveMinRequestAge(const ct
//------------------------------------------------------------------------------
// modifyUserGroupRetrievePriority
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::modifyUserGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t retrievePriority) {}
void cta::catalogue::MockCatalogue::modifyUserGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t retrievePriority) {}
//------------------------------------------------------------------------------
// modifyUserGroupRetrieveMinFilesQueued
......@@ -332,7 +332,7 @@ void cta::catalogue::MockCatalogue::modifyUserGroupRetrieveMinRequestAge(const c
//------------------------------------------------------------------------------
// modifyUserGroupMaxDrivesAllowed
//------------------------------------------------------------------------------
void cta::catalogue::MockCatalogue::modifyUserGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint16_t maxDrivesAllowed) {}
void cta::catalogue::MockCatalogue::modifyUserGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t maxDrivesAllowed) {}
//------------------------------------------------------------------------------
// modifyUserGroupComment
......
catalogue/MockCatalogue.hpp
View file @ 6f01b27b
......@@ -61,23 +61,23 @@ public:
virtual std::list<cta::common::dataStructures::AdminHost> getAdminHosts(const cta::common::dataStructures::SecurityIdentity &requester) const;
virtual void modifyAdminHostComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &hostName, const std::string &comment);
virtual void createStorageClass(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint16_t nbCopies, const std::string &comment);
virtual void createStorageClass(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbCopies, const std::string &comment);
virtual void deleteStorageClass(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name);
virtual std::list<cta::common::dataStructures::StorageClass> getStorageClasses(const cta::common::dataStructures::SecurityIdentity &requester) const;
virtual void modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint16_t nbCopies);
virtual void modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbCopies);
virtual void modifyStorageClassComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &comment);
virtual void createTapePool(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t nbPartialTapes, const std::string &comment);
virtual void createTapePool(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbPartialTapes, const std::string &comment);
virtual void deleteTapePool(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name);
virtual std::list<cta::common::dataStructures::TapePool> getTapePools(const cta::common::dataStructures::SecurityIdentity &requester) const;
virtual void modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t nbPartialTapes);
virtual void modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t nbPartialTapes);
virtual void modifyTapePoolComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &comment);
virtual void createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &tapePoolName, const std::string &comment);
virtual void deleteArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb);
virtual void createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName, const std::string &comment);
virtual void deleteArchiveRoute(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb);
virtual std::list<cta::common::dataStructures::ArchiveRoute> getArchiveRoutes(const cta::common::dataStructures::SecurityIdentity &requester) const;
virtual void modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &tapePoolName);
virtual void modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &comment);
virtual void modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName);
virtual void modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment);
virtual void createLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &comment);
virtual void deleteLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name);
......@@ -106,20 +106,20 @@ public:
virtual void modifyUserUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &group, const std::string &userGroup);
virtual void modifyUserComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &group, const std::string &comment);
virtual void createUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t archivePriority, const uint64_t minArchiveFilesQueued,
const uint64_t minArchiveBytesQueued, const uint64_t minArchiveRequestAge, const uint32_t retrievePriority, const uint64_t minRetrieveFilesQueued,
const uint64_t minRetrieveBytesQueued, const uint64_t minRetrieveRequestAge, const uint16_t maxDrivesAllowed, const std::string &comment);
virtual void createUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, 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 deleteUserGroup(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name);
virtual std::list<cta::common::dataStructures::UserGroup> getUserGroups(const cta::common::dataStructures::SecurityIdentity &requester) const;
virtual void modifyUserGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t archivePriority);
virtual void modifyUserGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t archivePriority);
virtual void modifyUserGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minArchiveFilesQueued);
virtual void modifyUserGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minArchiveBytesQueued);
virtual void modifyUserGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minArchiveRequestAge);
virtual void modifyUserGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint32_t retrievePriority);
virtual void modifyUserGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t retrievePriority);
virtual void modifyUserGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minRetrieveFilesQueued);
virtual void modifyUserGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minRetrieveBytesQueued);
virtual void modifyUserGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t minRetrieveRequestAge);
virtual void modifyUserGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint16_t maxDrivesAllowed);
virtual void modifyUserGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const uint64_t maxDrivesAllowed);
virtual void modifyUserGroupComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &name, const std::string &comment);
virtual void createDedication(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &drivename, const bool readonly, const bool writeonly, const std::string &userGroup,
......
common/dataStructures/ArchiveRoute.cpp
View file @ 6f01b27b
......@@ -70,7 +70,7 @@ std::string cta::common::dataStructures::ArchiveRoute::getComment() const {
//------------------------------------------------------------------------------
// setCopyNb
//------------------------------------------------------------------------------
void cta::common::dataStructures::ArchiveRoute::setCopyNb(const uint32_t copyNb) {
void cta::common::dataStructures::ArchiveRoute::setCopyNb(const uint64_t copyNb) {
m_copyNb = copyNb;
m_copyNbSet = true;
}
......@@ -78,7 +78,7 @@ void cta::common::dataStructures::ArchiveRoute::setCopyNb(const uint32_t copyNb)
//------------------------------------------------------------------------------
// getCopyNb
//------------------------------------------------------------------------------
uint32_t cta::common::dataStructures::ArchiveRoute::getCopyNb() const {
uint64_t cta::common::dataStructures::ArchiveRoute::getCopyNb() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the ArchiveRoute have been set!");
}
......
common/dataStructures/ArchiveRoute.hpp
View file @ 6f01b27b
......@@ -46,8 +46,8 @@ public:
void setComment(const std::string &comment);
std::string getComment() const;
void setCopyNb(const uint32_t copyNb);
uint32_t getCopyNb() const;
void setCopyNb(const uint64_t copyNb);
uint64_t getCopyNb() const;
void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
cta::common::dataStructures::EntryLog getCreationLog() const;
......@@ -72,7 +72,7 @@ private:
std::string m_comment;
bool m_commentSet;
uint32_t m_copyNb;
uint64_t m_copyNb;
bool m_copyNbSet;
cta::common::dataStructures::EntryLog m_creationLog;
......
common/dataStructures/StorageClass.cpp
View file @ 6f01b27b
......@@ -122,7 +122,7 @@ std::string cta::common::dataStructures::StorageClass::getName() const {
//------------------------------------------------------------------------------
// setNbCopies
//------------------------------------------------------------------------------
void cta::common::dataStructures::StorageClass::setNbCopies(const uint16_t nbCopies) {
void cta::common::dataStructures::StorageClass::setNbCopies(const uint64_t nbCopies) {
m_nbCopies = nbCopies;
m_nbCopiesSet = true;
}
......@@ -130,7 +130,7 @@ void cta::common::dataStructures::StorageClass::setNbCopies(const uint16_t nbCop
//------------------------------------------------------------------------------
// getNbCopies
//------------------------------------------------------------------------------
uint16_t cta::common::dataStructures::StorageClass::getNbCopies() const {
uint64_t cta::common::dataStructures::StorageClass::getNbCopies() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the StorageClass have been set!");
}
......
common/dataStructures/StorageClass.hpp
View file @ 6f01b27b
......@@ -55,8 +55,8 @@ public:
void setName(const std::string &name);
std::string getName() const;
void setNbCopies(const uint16_t nbCopies);
uint16_t getNbCopies() const;
void setNbCopies(const uint64_t nbCopies);
uint64_t getNbCopies() const;
private:
......@@ -78,7 +78,7 @@ private:
std::string m_name;
bool m_nameSet;
uint16_t m_nbCopies;
uint64_t m_nbCopies;
bool m_nbCopiesSet;
}; // class StorageClass
......
common/dataStructures/TapePool.cpp
View file @ 6f01b27b
......@@ -122,7 +122,7 @@ std::string cta::common::dataStructures::TapePool::getName() const {
//------------------------------------------------------------------------------
// setNbPartialTapes
//------------------------------------------------------------------------------
void cta::common::dataStructures::TapePool::setNbPartialTapes(const uint32_t nbPartialTapes) {
void cta::common::dataStructures::TapePool::setNbPartialTapes(const uint64_t nbPartialTapes) {
m_nbPartialTapes = nbPartialTapes;
m_nbPartialTapesSet = true;
}
......@@ -130,7 +130,7 @@ void cta::common::dataStructures::TapePool::setNbPartialTapes(const uint32_t nbP
//------------------------------------------------------------------------------
// getNbPartialTapes
//------------------------------------------------------------------------------
uint32_t cta::common::dataStructures::TapePool::getNbPartialTapes() const {
uint64_t cta::common::dataStructures::TapePool::getNbPartialTapes() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the TapePool have been set!");
}
......
common/dataStructures/TapePool.hpp
View file @ 6f01b27b
......@@ -55,8 +55,8 @@ public:
void setName(const std::string &name);
std::string getName() const;
void setNbPartialTapes(const uint32_t nbPartialTapes);
uint32_t getNbPartialTapes() const;
void setNbPartialTapes(const uint64_t nbPartialTapes);
uint64_t getNbPartialTapes() const;
private:
......@@ -78,7 +78,7 @@ private:
std::string m_name;
bool m_nameSet;
uint32_t m_nbPartialTapes;
uint64_t m_nbPartialTapes;
bool m_nbPartialTapesSet;
}; // class TapePool
......
common/dataStructures/UserGroup.cpp
View file @ 6f01b27b
......@@ -120,7 +120,7 @@ uint64_t cta::common::dataStructures::UserGroup::getArchive_minRequestAge() cons
//------------------------------------------------------------------------------
// setArchive_priority
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setArchive_priority(const uint32_t archive_priority) {
void cta::common::dataStructures::UserGroup::setArchive_priority(const uint64_t archive_priority) {
m_archive_priority = archive_priority;
m_archive_prioritySet = true;
}
......@@ -128,7 +128,7 @@ void cta::common::dataStructures::UserGroup::setArchive_priority(const uint32_t
//------------------------------------------------------------------------------
// getArchive_priority
//------------------------------------------------------------------------------
uint32_t cta::common::dataStructures::UserGroup::getArchive_priority() const {
uint64_t cta::common::dataStructures::UserGroup::getArchive_priority() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
}
......@@ -192,7 +192,7 @@ cta::common::dataStructures::EntryLog cta::common::dataStructures::UserGroup::ge
//------------------------------------------------------------------------------
// setMaxDrivesAllowed
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setMaxDrivesAllowed(const uint16_t maxDrivesAllowed) {
void cta::common::dataStructures::UserGroup::setMaxDrivesAllowed(const uint64_t maxDrivesAllowed) {
m_maxDrivesAllowed = maxDrivesAllowed;
m_maxDrivesAllowedSet = true;
}
......@@ -200,7 +200,7 @@ void cta::common::dataStructures::UserGroup::setMaxDrivesAllowed(const uint16_t
//------------------------------------------------------------------------------
// getMaxDrivesAllowed
//------------------------------------------------------------------------------
uint16_t cta::common::dataStructures::UserGroup::getMaxDrivesAllowed() const {
uint64_t cta::common::dataStructures::UserGroup::getMaxDrivesAllowed() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
}
......@@ -282,7 +282,7 @@ uint64_t cta::common::dataStructures::UserGroup::getRetrieve_minRequestAge() con
//------------------------------------------------------------------------------
// setRetrieve_priority
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setRetrieve_priority(const uint32_t retrieve_priority) {
void cta::common::dataStructures::UserGroup::setRetrieve_priority(const uint64_t retrieve_priority) {
m_retrieve_priority = retrieve_priority;
m_retrieve_prioritySet = true;
}
......@@ -290,7 +290,7 @@ void cta::common::dataStructures::UserGroup::setRetrieve_priority(const uint32_t
//------------------------------------------------------------------------------
// getRetrieve_priority
//------------------------------------------------------------------------------
uint32_t cta::common::dataStructures::UserGroup::getRetrieve_priority() const {
uint64_t cta::common::dataStructures::UserGroup::getRetrieve_priority() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
}
......
common/dataStructures/UserGroup.hpp
View file @ 6f01b27b
......@@ -52,8 +52,8 @@ public:
void setArchive_minRequestAge(const uint64_t archive_minRequestAge);
uint64_t getArchive_minRequestAge() const;
void setArchive_priority(const uint32_t archive_priority);
uint32_t getArchive_priority() const;
void setArchive_priority(const uint64_t archive_priority);
uint64_t getArchive_priority() const;
void setComment(const std::string &comment);
std::string getComment() const;
......@@ -64,8 +64,8 @@ public:
void setLastModificationLog(const cta::common::dataStructures::EntryLog &lastModificationLog);
cta::common::dataStructures::EntryLog getLastModificationLog() const;
void setMaxDrivesAllowed(const uint16_t maxDrivesAllowed);
uint16_t getMaxDrivesAllowed() const;
void setMaxDrivesAllowed(const uint64_t maxDrivesAllowed);
uint64_t getMaxDrivesAllowed() const;
void setName(const std::string &name);
std::string getName() const;
......@@ -79,8 +79,8 @@ public:
void setRetrieve_minRequestAge(const uint64_t retrieve_minRequestAge);
uint64_t getRetrieve_minRequestAge() const;
void setRetrieve_priority(const uint32_t retrieve_priority);
uint32_t getRetrieve_priority() const;
void setRetrieve_priority(const uint64_t retrieve_priority);
uint64_t getRetrieve_priority() const;
private:
......@@ -99,7 +99,7 @@ private:
uint64_t m_archive_minRequestAge;
bool m_archive_minRequestAgeSet;
uint32_t m_archive_priority;
uint64_t m_archive_priority;
bool m_archive_prioritySet;
std::string m_comment;
......@@ -111,7 +111,7 @@ private:
cta::common::dataStructures::EntryLog m_lastModificationLog;
bool m_lastModificationLogSet;
uint16_t m_maxDrivesAllowed;
uint64_t m_maxDrivesAllowed;
bool m_maxDrivesAllowedSet;
std::string m_name;
......@@ -126,7 +126,7 @@ private:
uint64_t m_retrieve_minRequestAge;
bool m_retrieve_minRequestAgeSet;
uint32_t m_retrieve_priority;
uint64_t m_retrieve_priority;
bool m_retrieve_prioritySet;
}; // class UserGroup
......
common/dataStructures/UserIdentity.cpp
View file @ 6f01b27b
......@@ -44,7 +44,7 @@ bool cta::common::dataStructures::UserIdentity::allFieldsSet() const {
//------------------------------------------------------------------------------
// setGid
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserIdentity::setGid(const uint32_t gid) {
void cta::common::dataStructures::UserIdentity::setGid(const uint64_t gid) {
m_gid = gid;
m_gidSet = true;
}
......@@ -52,7 +52,7 @@ void cta::common::dataStructures::UserIdentity::setGid(const uint32_t gid) {
//------------------------------------------------------------------------------
// getGid
//------------------------------------------------------------------------------
uint32_t cta::common::dataStructures::UserIdentity::getGid() const {
uint64_t cta::common::dataStructures::UserIdentity::getGid() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserIdentity have been set!");
}
......@@ -62,7 +62,7 @@ uint32_t cta::common::dataStructures::UserIdentity::getGid() const {
//------------------------------------------------------------------------------
// setUid
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserIdentity::setUid(const uint32_t uid) {
void cta::common::dataStructures::UserIdentity::setUid(const uint64_t uid) {
m_uid = uid;
m_uidSet = true;
}
......@@ -70,7 +70,7 @@ void cta::common::dataStructures::UserIdentity::setUid(const uint32_t uid) {
//------------------------------------------------------------------------------
// getUid
//------------------------------------------------------------------------------
uint32_t cta::common::dataStructures::UserIdentity::getUid() const {
uint64_t cta::common::dataStructures::UserIdentity::getUid() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserIdentity have been set!");
}
......
common/dataStructures/UserIdentity.hpp
View file @ 6f01b27b
......@@ -42,11 +42,11 @@ public:
*/
~UserIdentity() throw();
void setGid(const uint32_t gid);
uint32_t getGid() const;
void setGid(const uint64_t gid);
uint64_t getGid() const;
void setUid(const uint32_t uid);
uint32_t getUid() const;
void setUid(const uint64_t uid);
uint64_t getUid() const;
private:
......@@ -56,10 +56,10 @@ private:
*/
bool allFieldsSet() const;
uint32_t m_gid;
uint64_t m_gid;
bool m_gidSet;
uint32_t m_uid;
uint64_t m_uid;
bool m_uidSet;
}; // class UserIdentity
......
doc/4_5_Scheduler_Interface.txt
View file @ 6f01b27b
......@@ -99,24 +99,24 @@ virtual void deleteAdminHost
virtual std::list<AdminHost> getAdminHosts (const SecurityIdentity &requester) const;
virtual void modifyAdminHostComment (const SecurityIdentity &requester, const std::string &hostName, const std::string &comment);
virtual void createStorageClass (const SecurityIdentity &requester, const std::string &name, const uint16_t nbCopies, const std::string &comment);
virtual void createStorageClass (const SecurityIdentity &requester, const std::string &name, const uint64_t nbCopies, const std::string &comment);
virtual void deleteStorageClass (const SecurityIdentity &requester, const std::string &name);
virtual std::list<StorageClass> getStorageClasses (const SecurityIdentity &requester) const;
virtual void modifyStorageClassNbCopies (const SecurityIdentity &requester, const std::string &name, const uint16_t nbCopies);
virtual void modifyStorageClassNbCopies (const SecurityIdentity &requester, const std::string &name, const uint64_t nbCopies);
virtual void modifyStorageClassComment (const SecurityIdentity &requester, const std::string &name, const std::string &comment);
virtual void createTapePool (const SecurityIdentity &requester, const std::string &name, const uint32_t nbPartialTapes, const std::string &comment);
virtual void createTapePool (const SecurityIdentity &requester, const std::string &name, const uint64_t nbPartialTapes, const std::string &comment);
virtual void deleteTapePool (const SecurityIdentity &requester, const std::string &name);
virtual std::list<TapePool> getTapePools (const SecurityIdentity &requester) const;
virtual void modifyTapePoolNbPartialTapes (const SecurityIdentity &requester, const std::string &name, const uint32_t nbPartialTapes);
virtual void modifyTapePoolNbPartialTapes (const SecurityIdentity &requester, const std::string &name, const uint64_t nbPartialTapes);
virtual void modifyTapePoolComment (const SecurityIdentity &requester, const std::string &name, const std::string &comment);
virtual void createArchiveRoute (const SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &tapePoolName,
virtual void createArchiveRoute (const SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName,
const std::string &comment);
virtual void deleteArchiveRoute (const SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb);
virtual void deleteArchiveRoute (const SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb);
virtual std::list<ArchiveRoute> getArchiveRoutes (const SecurityIdentity &requester) const;
virtual void modifyArchiveRouteTapePoolName (const SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &tapePoolName);
virtual void modifyArchiveRouteComment (const SecurityIdentity &requester, const std::string &storageClassName, const uint16_t copyNb, const std::string &comment);
virtual void modifyArchiveRouteTapePoolName (const SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName);
virtual void modifyArchiveRouteComment (const SecurityIdentity &requester, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment);
virtual void createLogicalLibrary (const SecurityIdentity &requester, const std::string &name, const std::string &comment);
virtual void deleteLogicalLibrary (const SecurityIdentity &requester, const std::string &name);
......@@ -145,20 +145,20 @@ virtual std::list<User> getUsers
virtual void modifyUserUserGroup (const SecurityIdentity &requester, const std::string &name, const std::string &group, const std::string &userGroup);
virtual void modifyUserComment (const SecurityIdentity &requester, const std::string &name, const std::string &group, const std::string &comment);
virtual void createUserGroup (const SecurityIdentity &requester, const std::string &name, const uint32_t archivePriority, const uint64_t minArchiveFilesQueued,