diff --git a/catalogue/CatalogueTest.cpp b/catalogue/CatalogueTest.cpp index 22bc3c292444ab6d6f617918136ffdad7d640b5a..9204a2cac3c3bff5e47121337659780c4e1b0120 100644 --- a/catalogue/CatalogueTest.cpp +++ b/catalogue/CatalogueTest.cpp @@ -3429,6 +3429,78 @@ TEST_P(cta_catalogue_CatalogueTest, modifyRequesterMountPolicy) { } } +TEST_P(cta_catalogue_CatalogueTest, modifyRequesterComment) { + using namespace cta; + + ASSERT_TRUE(m_catalogue->getRequesterMountRules().empty()); + + const std::string mountPolicyName = "mount_policy"; + const uint64_t archivePriority = 1; + const uint64_t minArchiveRequestAge = 4; + const uint64_t retrievePriority = 5; + const uint64_t minRetrieveRequestAge = 8; + const uint64_t maxDrivesAllowed = 9; + + m_catalogue->createMountPolicy( + m_cliSI, + mountPolicyName, + archivePriority, + minArchiveRequestAge, + retrievePriority, + minRetrieveRequestAge, + maxDrivesAllowed, + "Create mount policy"); + + const std::string comment = "Create mount rule for requester"; + const std::string diskInstanceName = "disk_instance"; + const std::string requesterName = "requester_name"; + m_catalogue->createRequesterMountRule(m_cliSI, mountPolicyName, diskInstanceName, requesterName, comment); + + { + const std::list<common::dataStructures::RequesterMountRule> rules = m_catalogue->getRequesterMountRules(); + ASSERT_EQ(1, rules.size()); + + const common::dataStructures::RequesterMountRule rule = rules.front(); + + ASSERT_EQ(requesterName, rule.name); + ASSERT_EQ(mountPolicyName, rule.mountPolicy); + ASSERT_EQ(comment, rule.comment); + ASSERT_EQ(m_cliSI.username, rule.creationLog.username); + ASSERT_EQ(m_cliSI.host, rule.creationLog.host); + ASSERT_EQ(rule.creationLog, rule.lastModificationLog); + } + + const std::string modifiedComment = "Modified comment"; + m_catalogue->modifyRequesterComment(m_cliSI, diskInstanceName, requesterName, modifiedComment); + + { + const std::list<common::dataStructures::RequesterMountRule> rules = m_catalogue->getRequesterMountRules(); + ASSERT_EQ(1, rules.size()); + + const common::dataStructures::RequesterMountRule rule = rules.front(); + + ASSERT_EQ(requesterName, rule.name); + ASSERT_EQ(mountPolicyName, rule.mountPolicy); + ASSERT_EQ(modifiedComment, rule.comment); + ASSERT_EQ(m_cliSI.username, rule.creationLog.username); + ASSERT_EQ(m_cliSI.host, rule.creationLog.host); + ASSERT_EQ(rule.creationLog, rule.lastModificationLog); + } +} + +TEST_P(cta_catalogue_CatalogueTest, modifyRequesterComment_nonExistentRequester) { + using namespace cta; + + ASSERT_TRUE(m_catalogue->getRequesterMountRules().empty()); + + const std::string diskInstanceName = "disk_instance"; + const std::string requesterName = "requester_name"; + const std::string comment = "Comment"; + + ASSERT_THROW(m_catalogue->modifyRequesterComment(m_cliSI, diskInstanceName, requesterName, comment), + exception::UserError); +} + TEST_P(cta_catalogue_CatalogueTest, modifyRequesterMountPolicy_nonExistentRequester) { using namespace cta; diff --git a/catalogue/RdbmsCatalogue.cpp b/catalogue/RdbmsCatalogue.cpp index c6c9ed92e9d91079020042027853033566e8f0a1..ca029852c7d760fb2665d687af5560f6e702d95c 100644 --- a/catalogue/RdbmsCatalogue.cpp +++ b/catalogue/RdbmsCatalogue.cpp @@ -2128,12 +2128,42 @@ void RdbmsCatalogue::modifyRequesterMountPolicy(const common::dataStructures::Se //------------------------------------------------------------------------------ // modifyRequesterComment //------------------------------------------------------------------------------ -void RdbmsCatalogue::modifyRequesterComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &instanceName, const std::string &requesterName, const std::string &comment) { - throw exception::Exception(std::string(__FUNCTION__) + " not implemented"); +void RdbmsCatalogue::modifyRequesterComment(const common::dataStructures::SecurityIdentity &cliIdentity, + const std::string &instanceName, const std::string &requesterName, const std::string &comment) { + try { + const time_t now = time(nullptr); + const char *const sql = + "UPDATE REQUESTER_MOUNT_RULE SET " + "USER_COMMENT = :USER_COMMENT," + "LAST_UPDATE_USER_NAME = :LAST_UPDATE_USER_NAME," + "LAST_UPDATE_HOST_NAME = :LAST_UPDATE_HOST_NAME," + "LAST_UPDATE_TIME = :LAST_UPDATE_TIME " + "WHERE " + "DISK_INSTANCE_NAME = :DISK_INSTANCE_NAME AND " + "REQUESTER_NAME = :REQUESTER_NAME"; + auto conn = m_connPool.getConn(); + auto stmt = conn->createStmt(sql, rdbms::Stmt::AutocommitMode::ON); + stmt->bindString(":USER_COMMENT", comment); + stmt->bindString(":LAST_UPDATE_USER_NAME", cliIdentity.username); + stmt->bindString(":LAST_UPDATE_HOST_NAME", cliIdentity.host); + stmt->bindUint64(":LAST_UPDATE_TIME", now); + stmt->bindString(":DISK_INSTANCE_NAME", instanceName); + stmt->bindString(":REQUESTER_NAME", requesterName); + stmt->executeNonQuery(); + + if(0 == stmt->getNbAffectedRows()) { + throw exception::UserError(std::string("Cannot modify requester mount rule ") + instanceName + ":" + + requesterName + " because it does not exist"); + } + } catch(exception::UserError &) { + throw; + } catch (exception::Exception &ex) { + throw exception::Exception(std::string(__FUNCTION__) + " failed: " + ex.getMessage().str()); + } } //------------------------------------------------------------------------------ -// modifyRequesterMountPolicy +// modifyRequesterGroupMountPolicy //------------------------------------------------------------------------------ void RdbmsCatalogue::modifyRequesterGroupMountPolicy(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &instanceName, const std::string &requesterGroupName, const std::string &mountPolicy) { throw exception::Exception(std::string(__FUNCTION__) + " not implemented");