From 98c0ab58383f1b5fc07d5dea27d55b31060674cd Mon Sep 17 00:00:00 2001
From: mvelosob <miguel.veloso.barros@cern.ch>
Date: Thu, 21 Oct 2021 10:45:23 +0200
Subject: [PATCH] make all short options in cta-admin consistent
---
cmdline/CtaAdminCmdParse.hpp | 14 +++++++-------
.../orchestration/tests/repack_systemtest.sh | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmdline/CtaAdminCmdParse.hpp b/cmdline/CtaAdminCmdParse.hpp
index e2c2b8a2f4..a1e5f38b63 100644
--- a/cmdline/CtaAdminCmdParse.hpp
+++ b/cmdline/CtaAdminCmdParse.hpp
@@ -456,7 +456,7 @@ const Option opt_fidfile { Option::OPT_STR_LIST, "--fxidfile",
const Option opt_filename { Option::OPT_STR, "--file", "-f", " <filename>" };
const Option opt_force { Option::OPT_BOOL, "--force", "-f", " <\"true\" or \"false\">" };
const Option opt_force_flag { Option::OPT_FLAG, "--force", "-f", "" };
-const Option opt_fromcastor { Option::OPT_BOOL, "--fromcastor", "-fc", " <\"true\" or \"false\">"};
+const Option opt_fromcastor { Option::OPT_BOOL, "--fromcastor", "--fc", " <\"true\" or \"false\">"};
const Option opt_instance { Option::OPT_STR, "--instance", "-i", " <disk_instance>" };
const Option opt_justarchive { Option::OPT_FLAG, "--justarchive", "-a", "" };
const Option opt_justmove { Option::OPT_FLAG, "--justmove", "-m", "" };
@@ -466,12 +466,12 @@ const Option opt_log { Option::OPT_FLAG, "--log",
const Option opt_logicallibrary { Option::OPT_STR, "--logicallibrary", "-l", " <logical_library_name>" };
const Option opt_logicallibrary_alias { Option::OPT_STR, "--name", "-n", " <logical_library_name>", "--logicallibrary" };
const Option opt_lookupns { Option::OPT_FLAG, "--lookupnamespace", "-l", "" };
-const Option opt_maxfilesize { Option::OPT_UINT, "--maxfilesize", "-mfs", " <maximum_file_size>" };
-const Option opt_maxlpos { Option::OPT_UINT, "--maxlpos", "-maxl", " <maximum_longitudinal_position>" };
+const Option opt_maxfilesize { Option::OPT_UINT, "--maxfilesize", "--mfs", " <maximum_file_size>" };
+const Option opt_maxlpos { Option::OPT_UINT, "--maxlpos", "--maxl", " <maximum_longitudinal_position>" };
const Option opt_mediatype { Option::OPT_STR, "--mediatype", "--mt", " <media_type_name>" };
const Option opt_mediatype_alias { Option::OPT_STR, "--name", "-n", " <media_type_name>", "--mediatype" };
const Option opt_minarchiverequestage { Option::OPT_UINT, "--minarchiverequestage", "--aa", " <min_request_age>" };
-const Option opt_minlpos { Option::OPT_UINT, "--minlpos", "-minl", " <minimum_longitudinal_position>" };
+const Option opt_minlpos { Option::OPT_UINT, "--minlpos", "--minl", " <minimum_longitudinal_position>" };
const Option opt_minretrieverequestage{ Option::OPT_UINT, "--minretrieverequestage", "--ra", " <min_request_age>" };
const Option opt_mountpolicy { Option::OPT_STR, "--mountpolicy", "-u", " <mount_policy_name>" };
const Option opt_mountpolicy_alias { Option::OPT_STR, "--name", "-n", " <mount_policy_name>", "--mountpolicy" };
@@ -503,10 +503,10 @@ const Option opt_refresh_interval { Option::OPT_UINT, "--refreshinterval",
const Option opt_targeted_free_space { Option::OPT_UINT, "--targetedfreespace", "-f", " <targeted_free_space>" };
const Option opt_sleep_time { Option::OPT_UINT, "--sleeptime", "-s", " <sleep time in s>" };
const Option opt_reason { Option::OPT_STR, "--reason", "-r", " <reason_status_change>" };
-const Option opt_no_recall { Option::OPT_FLAG, "--no-recall", "-nr", "" };
+const Option opt_no_recall { Option::OPT_FLAG, "--no-recall", "--nr", "" };
const Option opt_object_id { Option::OPT_STR, "--objectid", "-o", " <objectId>" };
-const Option opt_read_max_drives { Option::OPT_UINT, "--readmaxdrives", "-rmd", " <read_max_drives>" };
-const Option opt_write_max_drives { Option::OPT_UINT, "--writemaxdrives", "-wmd", " <write_max_drives>" };
+const Option opt_read_max_drives { Option::OPT_UINT, "--readmaxdrives", "--rmd", " <read_max_drives>" };
+const Option opt_write_max_drives { Option::OPT_UINT, "--writemaxdrives", "--wmd", " <write_max_drives>" };
const Option opt_state { Option::OPT_STR, "--state", "-s", std::string(" <\"") + Tape::stateToString(Tape::ACTIVE) +"\"" + " or \"" + Tape::stateToString(Tape::DISABLED) + "\" or \"" + Tape::stateToString(Tape::BROKEN) + "\">" };
diff --git a/continuousintegration/orchestration/tests/repack_systemtest.sh b/continuousintegration/orchestration/tests/repack_systemtest.sh
index 65e233ee10..e3ba910891 100755
--- a/continuousintegration/orchestration/tests/repack_systemtest.sh
+++ b/continuousintegration/orchestration/tests/repack_systemtest.sh
@@ -160,7 +160,7 @@ echo "Launching repack request for VID ${VID_TO_REPACK}, bufferURL = ${FULL_REPA
NO_RECALL_FLAG=""
if [ ! -z $NO_RECALL ]; then
- NO_RECALL_FLAG="-nr"
+ NO_RECALL_FLAG="--nr"
fi
admin_cta repack add --mountpolicy ${MOUNT_POLICY_NAME} --vid ${VID_TO_REPACK} ${REPACK_OPTION} --bufferurl ${FULL_REPACK_BUFFER_URL} ${DISABLED_TAPE_FLAG} ${NO_RECALL_FLAG} || exit 1
--
GitLab