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

renamed usergroup into mountgroup

parent a0304762
......@@ -53,7 +53,7 @@
#include "common/dataStructures/Tape.hpp"
#include "common/dataStructures/TapePool.hpp"
#include "common/dataStructures/UpdateFileInfoRequest.hpp"
#include "common/dataStructures/UserGroup.hpp"
#include "common/dataStructures/MountGroup.hpp"
#include "common/dataStructures/User.hpp"
#include "common/dataStructures/UserIdentity.hpp"
#include "common/dataStructures/VerifyInfo.hpp"
......@@ -125,34 +125,34 @@ public:
virtual void setTapeDisabled(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool disabledValue) = 0;
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 &userGroup, 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 modifyUserUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &userGroup) = 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 createUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority, const uint64_t minArchiveFilesQueued,
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 deleteUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::UserGroup> getUserGroups(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const = 0;
virtual void modifyUserGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority) = 0;
virtual void modifyUserGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued) = 0;
virtual void modifyUserGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveBytesQueued) = 0;
virtual void modifyUserGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge) = 0;
virtual void modifyUserGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority) = 0;
virtual void modifyUserGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued) = 0;
virtual void modifyUserGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveBytesQueued) = 0;
virtual void modifyUserGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge) = 0;
virtual void modifyUserGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed) = 0;
virtual void modifyUserGroupComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) = 0;
virtual void createDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType, const std::string &userGroup,
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 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;
virtual void modifyMountGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge) = 0;
virtual void modifyMountGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority) = 0;
virtual void modifyMountGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued) = 0;
virtual void modifyMountGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveBytesQueued) = 0;
virtual void modifyMountGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge) = 0;
virtual void modifyMountGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed) = 0;
virtual void modifyMountGroupComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) = 0;
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 modifyDedicationType(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType) = 0;
virtual void modifyDedicationUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &userGroup) = 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;
virtual void modifyDedicationVid(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &vid) = 0;
virtual void modifyDedicationFrom(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t fromTimestamp) = 0;
......
......@@ -226,7 +226,7 @@ void cta::catalogue::DummyCatalogue::modifyTapeComment(const cta::common::dataSt
//------------------------------------------------------------------------------
// createUser
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::createUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &userGroup, const std::string &comment) {}
void cta::catalogue::DummyCatalogue::createUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup, const std::string &comment) {}
//------------------------------------------------------------------------------
// deleteUser
......@@ -239,9 +239,9 @@ void cta::catalogue::DummyCatalogue::deleteUser(const cta::common::dataStructure
std::list<cta::common::dataStructures::User> cta::catalogue::DummyCatalogue::getUsers(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::User>();}
//------------------------------------------------------------------------------
// modifyUserUserGroup
// modifyUserMountGroup
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &userGroup) {}
void cta::catalogue::DummyCatalogue::modifyUserMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup) {}
//------------------------------------------------------------------------------
// modifyUserComment
......@@ -249,76 +249,76 @@ void cta::catalogue::DummyCatalogue::modifyUserUserGroup(const cta::common::data
void cta::catalogue::DummyCatalogue::modifyUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &comment) {}
//------------------------------------------------------------------------------
// createUserGroup
// createMountGroup
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::createUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority, const uint64_t minArchiveFilesQueued,
void cta::catalogue::DummyCatalogue::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) {}
//------------------------------------------------------------------------------
// deleteUserGroup
// deleteMountGroup
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::deleteUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
void cta::catalogue::DummyCatalogue::deleteMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name) {}
//------------------------------------------------------------------------------
// getUserGroups
// getMountGroups
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::UserGroup> cta::catalogue::DummyCatalogue::getUserGroups(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::UserGroup>();}
std::list<cta::common::dataStructures::MountGroup> cta::catalogue::DummyCatalogue::getMountGroups(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const { return std::list<cta::common::dataStructures::MountGroup>();}
//------------------------------------------------------------------------------
// modifyUserGroupArchivePriority
// modifyMountGroupArchivePriority
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority) {}
//------------------------------------------------------------------------------
// modifyUserGroupArchiveMinFilesQueued
// modifyMountGroupArchiveMinFilesQueued
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued) {}
//------------------------------------------------------------------------------
// modifyUserGroupArchiveMinBytesQueued
// modifyMountGroupArchiveMinBytesQueued
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveBytesQueued) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveBytesQueued) {}
//------------------------------------------------------------------------------
// modifyUserGroupArchiveMinRequestAge
// modifyMountGroupArchiveMinRequestAge
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge) {}
//------------------------------------------------------------------------------
// modifyUserGroupRetrievePriority
// modifyMountGroupRetrievePriority
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority) {}
//------------------------------------------------------------------------------
// modifyUserGroupRetrieveMinFilesQueued
// modifyMountGroupRetrieveMinFilesQueued
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued) {}
//------------------------------------------------------------------------------
// modifyUserGroupRetrieveMinBytesQueued
// modifyMountGroupRetrieveMinBytesQueued
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveBytesQueued) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveBytesQueued) {}
//------------------------------------------------------------------------------
// modifyUserGroupRetrieveMinRequestAge
// modifyMountGroupRetrieveMinRequestAge
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge) {}
//------------------------------------------------------------------------------
// modifyUserGroupMaxDrivesAllowed
// modifyMountGroupMaxDrivesAllowed
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed) {}
//------------------------------------------------------------------------------
// modifyUserGroupComment
// modifyMountGroupComment
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyUserGroupComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
void cta::catalogue::DummyCatalogue::modifyMountGroupComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
//------------------------------------------------------------------------------
// createDedication
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::createDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType, const std::string &userGroup,
void cta::catalogue::DummyCatalogue::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) {}
//------------------------------------------------------------------------------
......@@ -337,9 +337,9 @@ std::list<cta::common::dataStructures::Dedication> cta::catalogue::DummyCatalogu
void cta::catalogue::DummyCatalogue::modifyDedicationType(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType) {}
//------------------------------------------------------------------------------
// modifyDedicationUserGroup
// modifyDedicationMountGroup
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::modifyDedicationUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &userGroup) {}
void cta::catalogue::DummyCatalogue::modifyDedicationMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &mountGroup) {}
//------------------------------------------------------------------------------
// modifyDedicationTag
......
......@@ -84,34 +84,34 @@ public:
virtual void setTapeDisabled(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool disabledValue);
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 &userGroup, 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 modifyUserUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &userGroup);
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 createUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority, const uint64_t minArchiveFilesQueued,
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 deleteUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name);
virtual std::list<cta::common::dataStructures::UserGroup> getUserGroups(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
virtual void modifyUserGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority);
virtual void modifyUserGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued);
virtual void modifyUserGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveBytesQueued);
virtual void modifyUserGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge);
virtual void modifyUserGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority);
virtual void modifyUserGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued);
virtual void modifyUserGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveBytesQueued);
virtual void modifyUserGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge);
virtual void modifyUserGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed);
virtual void modifyUserGroupComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
virtual void createDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType, const std::string &userGroup,
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 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);
virtual void modifyMountGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge);
virtual void modifyMountGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority);
virtual void modifyMountGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued);
virtual void modifyMountGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveBytesQueued);
virtual void modifyMountGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge);
virtual void modifyMountGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed);
virtual void modifyMountGroupComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
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 modifyDedicationType(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType);
virtual void modifyDedicationUserGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &userGroup);
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);
virtual void modifyDedicationVid(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &vid);
virtual void modifyDedicationFrom(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t fromTimestamp);
......
......@@ -17,6 +17,7 @@ set (COMMON_LIB_SRC_FILES
dataStructures/DriveStatus.cpp
dataStructures/EntryLog.cpp
dataStructures/ListStorageClassRequest.cpp
dataStructures/MountGroup.cpp
dataStructures/MountType.cpp
dataStructures/MountPolicy.cpp
dataStructures/ReadTestResult.cpp
......@@ -33,7 +34,6 @@ set (COMMON_LIB_SRC_FILES
dataStructures/TestSourceType.cpp
dataStructures/UpdateFileInfoRequest.cpp
dataStructures/User.cpp
dataStructures/UserGroup.cpp
dataStructures/UserIdentity.cpp
dataStructures/VerifyInfo.cpp
dataStructures/WriteTestResult.cpp
......
......@@ -31,7 +31,7 @@ cta::common::dataStructures::Dedication::Dedication() {
m_lastModificationLogSet = false;
m_tagSet = false;
m_untilTimestampSet = false;
m_userGroupSet = false;
m_mountGroupSet = false;
m_vidSet = false;
}
......@@ -53,7 +53,7 @@ bool cta::common::dataStructures::Dedication::allFieldsSet() const {
&& m_lastModificationLogSet
&& m_tagSet
&& m_untilTimestampSet
&& m_userGroupSet
&& m_mountGroupSet
&& m_vidSet;
}
......@@ -202,21 +202,21 @@ uint64_t cta::common::dataStructures::Dedication::getUntilTimestamp() const {
}
//------------------------------------------------------------------------------
// setUserGroup
// setMountGroup
//------------------------------------------------------------------------------
void cta::common::dataStructures::Dedication::setUserGroup(const std::string &userGroup) {
m_userGroup = userGroup;
m_userGroupSet = true;
void cta::common::dataStructures::Dedication::setMountGroup(const std::string &mountGroup) {
m_mountGroup = mountGroup;
m_mountGroupSet = true;
}
//------------------------------------------------------------------------------
// getUserGroup
// getMountGroup
//------------------------------------------------------------------------------
std::string cta::common::dataStructures::Dedication::getUserGroup() const {
std::string cta::common::dataStructures::Dedication::getMountGroup() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the Dedication have been set!");
}
return m_userGroup;
return m_mountGroup;
}
//------------------------------------------------------------------------------
......
......@@ -68,8 +68,8 @@ public:
void setUntilTimestamp(const uint64_t untilTimestamp);
uint64_t getUntilTimestamp() const;
void setUserGroup(const std::string &userGroup);
std::string getUserGroup() const;
void setMountGroup(const std::string &mountGroup);
std::string getMountGroup() const;
void setVid(const std::string &vid);
std::string getVid() const;
......@@ -106,8 +106,8 @@ private:
uint64_t m_untilTimestamp;
bool m_untilTimestampSet;
std::string m_userGroup;
bool m_userGroupSet;
std::string m_mountGroup;
bool m_mountGroupSet;
std::string m_vid;
bool m_vidSet;
......
......@@ -16,13 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/dataStructures/UserGroup.hpp"
#include "common/dataStructures/MountGroup.hpp"
#include "common/exception/Exception.hpp"
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
cta::common::dataStructures::UserGroup::UserGroup() {
cta::common::dataStructures::MountGroup::MountGroup() {
m_archive_minBytesQueuedSet = false;
m_archive_minFilesQueuedSet = false;
m_archive_minRequestAgeSet = false;
......@@ -41,13 +41,13 @@ cta::common::dataStructures::UserGroup::UserGroup() {
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
cta::common::dataStructures::UserGroup::~UserGroup() throw() {
cta::common::dataStructures::MountGroup::~MountGroup() throw() {
}
//------------------------------------------------------------------------------
// allFieldsSet
//------------------------------------------------------------------------------
bool cta::common::dataStructures::UserGroup::allFieldsSet() const {
bool cta::common::dataStructures::MountGroup::allFieldsSet() const {
return m_archive_minBytesQueuedSet
&& m_archive_minFilesQueuedSet
&& m_archive_minRequestAgeSet
......@@ -66,7 +66,7 @@ bool cta::common::dataStructures::UserGroup::allFieldsSet() const {
//------------------------------------------------------------------------------
// setArchive_minBytesQueued
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setArchive_minBytesQueued(const uint64_t archive_minBytesQueued) {
void cta::common::dataStructures::MountGroup::setArchive_minBytesQueued(const uint64_t archive_minBytesQueued) {
m_archive_minBytesQueued = archive_minBytesQueued;
m_archive_minBytesQueuedSet = true;
}
......@@ -74,9 +74,9 @@ void cta::common::dataStructures::UserGroup::setArchive_minBytesQueued(const uin
//------------------------------------------------------------------------------
// getArchive_minBytesQueued
//------------------------------------------------------------------------------
uint64_t cta::common::dataStructures::UserGroup::getArchive_minBytesQueued() const {
uint64_t cta::common::dataStructures::MountGroup::getArchive_minBytesQueued() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the MountGroup have been set!");
}
return m_archive_minBytesQueued;
}
......@@ -84,7 +84,7 @@ uint64_t cta::common::dataStructures::UserGroup::getArchive_minBytesQueued() con
//------------------------------------------------------------------------------
// setArchive_minFilesQueued
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setArchive_minFilesQueued(const uint64_t archive_minFilesQueued) {
void cta::common::dataStructures::MountGroup::setArchive_minFilesQueued(const uint64_t archive_minFilesQueued) {
m_archive_minFilesQueued = archive_minFilesQueued;
m_archive_minFilesQueuedSet = true;
}
......@@ -92,9 +92,9 @@ void cta::common::dataStructures::UserGroup::setArchive_minFilesQueued(const uin
//------------------------------------------------------------------------------
// getArchive_minFilesQueued
//------------------------------------------------------------------------------
uint64_t cta::common::dataStructures::UserGroup::getArchive_minFilesQueued() const {
uint64_t cta::common::dataStructures::MountGroup::getArchive_minFilesQueued() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the MountGroup have been set!");
}
return m_archive_minFilesQueued;
}
......@@ -102,7 +102,7 @@ uint64_t cta::common::dataStructures::UserGroup::getArchive_minFilesQueued() con
//------------------------------------------------------------------------------
// setArchive_minRequestAge
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setArchive_minRequestAge(const uint64_t archive_minRequestAge) {
void cta::common::dataStructures::MountGroup::setArchive_minRequestAge(const uint64_t archive_minRequestAge) {
m_archive_minRequestAge = archive_minRequestAge;
m_archive_minRequestAgeSet = true;
}
......@@ -110,9 +110,9 @@ void cta::common::dataStructures::UserGroup::setArchive_minRequestAge(const uint
//------------------------------------------------------------------------------
// getArchive_minRequestAge
//------------------------------------------------------------------------------
uint64_t cta::common::dataStructures::UserGroup::getArchive_minRequestAge() const {
uint64_t cta::common::dataStructures::MountGroup::getArchive_minRequestAge() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the MountGroup have been set!");
}
return m_archive_minRequestAge;
}
......@@ -120,7 +120,7 @@ uint64_t cta::common::dataStructures::UserGroup::getArchive_minRequestAge() cons
//------------------------------------------------------------------------------
// setArchive_priority
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setArchive_priority(const uint64_t archive_priority) {
void cta::common::dataStructures::MountGroup::setArchive_priority(const uint64_t archive_priority) {
m_archive_priority = archive_priority;
m_archive_prioritySet = true;
}
......@@ -128,9 +128,9 @@ void cta::common::dataStructures::UserGroup::setArchive_priority(const uint64_t
//------------------------------------------------------------------------------
// getArchive_priority
//------------------------------------------------------------------------------
uint64_t cta::common::dataStructures::UserGroup::getArchive_priority() const {
uint64_t cta::common::dataStructures::MountGroup::getArchive_priority() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the MountGroup have been set!");
}
return m_archive_priority;
}
......@@ -138,7 +138,7 @@ uint64_t cta::common::dataStructures::UserGroup::getArchive_priority() const {
//------------------------------------------------------------------------------
// setComment
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setComment(const std::string &comment) {
void cta::common::dataStructures::MountGroup::setComment(const std::string &comment) {
m_comment = comment;
m_commentSet = true;
}
......@@ -146,9 +146,9 @@ void cta::common::dataStructures::UserGroup::setComment(const std::string &comme
//------------------------------------------------------------------------------
// getComment
//------------------------------------------------------------------------------
std::string cta::common::dataStructures::UserGroup::getComment() const {
std::string cta::common::dataStructures::MountGroup::getComment() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the MountGroup have been set!");
}
return m_comment;
}
......@@ -156,7 +156,7 @@ std::string cta::common::dataStructures::UserGroup::getComment() const {
//------------------------------------------------------------------------------
// setCreationLog
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
void cta::common::dataStructures::MountGroup::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
m_creationLog = creationLog;
m_creationLogSet = true;
}
......@@ -164,9 +164,9 @@ void cta::common::dataStructures::UserGroup::setCreationLog(const cta::common::d
//------------------------------------------------------------------------------
// getCreationLog
//------------------------------------------------------------------------------
cta::common::dataStructures::EntryLog cta::common::dataStructures::UserGroup::getCreationLog() const {
cta::common::dataStructures::EntryLog cta::common::dataStructures::MountGroup::getCreationLog() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the MountGroup have been set!");
}
return m_creationLog;
}
......@@ -174,7 +174,7 @@ cta::common::dataStructures::EntryLog cta::common::dataStructures::UserGroup::ge
//------------------------------------------------------------------------------
// setLastModificationLog
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setLastModificationLog(const cta::common::dataStructures::EntryLog &lastModificationLog) {
void cta::common::dataStructures::MountGroup::setLastModificationLog(const cta::common::dataStructures::EntryLog &lastModificationLog) {
m_lastModificationLog = lastModificationLog;
m_lastModificationLogSet = true;
}
......@@ -182,9 +182,9 @@ void cta::common::dataStructures::UserGroup::setLastModificationLog(const cta::c
//------------------------------------------------------------------------------
// getLastModificationLog
//------------------------------------------------------------------------------
cta::common::dataStructures::EntryLog cta::common::dataStructures::UserGroup::getLastModificationLog() const {
cta::common::dataStructures::EntryLog cta::common::dataStructures::MountGroup::getLastModificationLog() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the MountGroup have been set!");
}
return m_lastModificationLog;
}
......@@ -192,7 +192,7 @@ cta::common::dataStructures::EntryLog cta::common::dataStructures::UserGroup::ge
//------------------------------------------------------------------------------
// setMaxDrivesAllowed
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setMaxDrivesAllowed(const uint64_t maxDrivesAllowed) {
void cta::common::dataStructures::MountGroup::setMaxDrivesAllowed(const uint64_t maxDrivesAllowed) {
m_maxDrivesAllowed = maxDrivesAllowed;
m_maxDrivesAllowedSet = true;
}
......@@ -200,9 +200,9 @@ void cta::common::dataStructures::UserGroup::setMaxDrivesAllowed(const uint64_t
//------------------------------------------------------------------------------
// getMaxDrivesAllowed
//------------------------------------------------------------------------------
uint64_t cta::common::dataStructures::UserGroup::getMaxDrivesAllowed() const {
uint64_t cta::common::dataStructures::MountGroup::getMaxDrivesAllowed() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserGroup have been set!");
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the MountGroup have been set!");
}
return m_maxDrivesAllowed;
}
......@@ -210,7 +210,7 @@ uint64_t cta::common::dataStructures::UserGroup::getMaxDrivesAllowed() const {
//------------------------------------------------------------------------------
// setName
//------------------------------------------------------------------------------
void cta::common::dataStructures::UserGroup::setName(const std::string &name) {
void cta::common::dataStructures::MountGroup::setName(const std::string &name) {
m_name = name;
m_nameSet = true;
}
......@@ -218,9 +218,9 @@ void cta::common::dataStructures::UserGroup::setName(const std::string &name) {
//------------------------------------------------------------------------------
// getName
//------------------------------------------------------------------------------
std::string cta::common::dataStructures::UserGroup::getName()