From 04b4ee57664199d87415dbb0d22da40a54f60252 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Wed, 22 May 2019 21:15:51 +0200
Subject: [PATCH] Added '--disabled' option to 'cta-admin logicallibrary add'
---
cmdline/CtaAdminCmdParse.hpp | 3 ++-
xroot_plugins/XrdSsiCtaRequestMessage.cpp | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/cmdline/CtaAdminCmdParse.hpp b/cmdline/CtaAdminCmdParse.hpp
index 53d812efa7..10eaaaf552 100644
--- a/cmdline/CtaAdminCmdParse.hpp
+++ b/cmdline/CtaAdminCmdParse.hpp
@@ -487,7 +487,8 @@ const std::map<cmd_key_t, cmd_val_t> cmdOptions = {
{{ AdminCmd::CMD_LISTPENDINGRETRIEVES, AdminCmd::SUBCMD_NONE },
{ opt_header.optional(), opt_vid.optional(), opt_extended.optional() }},
/*----------------------------------------------------------------------------------------------------*/
- {{ AdminCmd::CMD_LOGICALLIBRARY, AdminCmd::SUBCMD_ADD }, { opt_logicallibrary_alias, opt_comment }},
+ {{ 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_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 fc7e704a6b..d6a1aaca7f 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
@@ -1201,11 +1201,11 @@ void RequestMessage::processLogicalLibrary_Add(const cta::admin::AdminCmd &admin
{
using namespace cta::admin;
- auto &name = getRequired(OptionString::LOGICAL_LIBRARY);
- auto &comment = getRequired(OptionString::COMMENT);
- const bool isDisabled = false; // TBD
+ auto &name = getRequired(OptionString::LOGICAL_LIBRARY);
+ auto isDisabled = getOptional(OptionBoolean::DISABLED);
+ auto &comment = getRequired(OptionString::COMMENT);
- m_catalogue.createLogicalLibrary(m_cliIdentity, name, isDisabled, comment);
+ m_catalogue.createLogicalLibrary(m_cliIdentity, name, isDisabled ? isDisabled.value() : false, comment);
response.set_type(cta::xrd::Response::RSP_SUCCESS);
}
--
GitLab