From 0533fa700381dbb89e36856051a9862e1721d242 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Wed, 22 May 2019 21:55:53 +0200
Subject: [PATCH] Added '--disabled' option to 'cta-admin logicallibrary ch'
---
cmdline/CtaAdminCmdParse.hpp | 3 ++-
xroot_plugins/XrdSsiCtaRequestMessage.cpp | 12 +++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cmdline/CtaAdminCmdParse.hpp b/cmdline/CtaAdminCmdParse.hpp
index 10eaaaf552..6ac36600b9 100644
--- a/cmdline/CtaAdminCmdParse.hpp
+++ b/cmdline/CtaAdminCmdParse.hpp
@@ -489,7 +489,8 @@ const std::map<cmd_key_t, cmd_val_t> cmdOptions = {
/*----------------------------------------------------------------------------------------------------*/
{{ AdminCmd::CMD_LOGICALLIBRARY, AdminCmd::SUBCMD_ADD },
{ opt_logicallibrary_alias, opt_disabled.optional(), opt_comment }},
- {{ AdminCmd::CMD_LOGICALLIBRARY, AdminCmd::SUBCMD_CH }, { opt_logicallibrary_alias, opt_comment }},
+ {{ AdminCmd::CMD_LOGICALLIBRARY, AdminCmd::SUBCMD_CH },
+ { opt_logicallibrary_alias, opt_disabled.optional(), opt_comment.optional() }},
{{ AdminCmd::CMD_LOGICALLIBRARY, AdminCmd::SUBCMD_RM }, { opt_logicallibrary_alias }},
{{ AdminCmd::CMD_LOGICALLIBRARY, AdminCmd::SUBCMD_LS }, { opt_header.optional() }},
/*----------------------------------------------------------------------------------------------------*/
diff --git a/xroot_plugins/XrdSsiCtaRequestMessage.cpp b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
index d6a1aaca7f..a1ae61835e 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
@@ -1216,10 +1216,16 @@ void RequestMessage::processLogicalLibrary_Ch(const cta::admin::AdminCmd &adminc
{
using namespace cta::admin;
- auto &name = getRequired(OptionString::LOGICAL_LIBRARY);
- auto &comment = getRequired(OptionString::COMMENT);
+ auto &name = getRequired(OptionString::LOGICAL_LIBRARY);
+ auto disabled = getOptional(OptionBoolean::DISABLED);
+ auto comment = getOptional(OptionString::COMMENT);
- m_catalogue.modifyLogicalLibraryComment(m_cliIdentity, name, comment);
+ if(disabled) {
+ m_catalogue.setLogicalLibraryDisabled(m_cliIdentity, name, disabled.value());
+ }
+ if(comment) {
+ m_catalogue.modifyLogicalLibraryComment(m_cliIdentity, name, comment.value());
+ }
response.set_type(cta::xrd::Response::RSP_SUCCESS);
}
--
GitLab