diff --git a/cmdline/CtaAdminCmdParse.hpp b/cmdline/CtaAdminCmdParse.hpp index c3bdd28580e1d93ded830ee2f3ab1c2e5abf0f7a..ae2528e6fe7b28ac5b70d61b2b8c888f2210e9cb 100644 --- a/cmdline/CtaAdminCmdParse.hpp +++ b/cmdline/CtaAdminCmdParse.hpp @@ -244,7 +244,7 @@ const std::map<std::string, OptionBoolean::Key> boolOptions = { { "--encrypted", OptionBoolean::ENCRYPTED }, { "--force", OptionBoolean::FORCE }, { "--full", OptionBoolean::FULL }, - { "--rdonly", OptionBoolean::READ_ONLY }, + { "--readonly", OptionBoolean::READ_ONLY }, // hasOption options { "--checkchecksum", OptionBoolean::CHECK_CHECKSUM }, @@ -419,7 +419,7 @@ const Option opt_vid { Option::OPT_STR, "--vid", const Option opt_vo { Option::OPT_STR, "--vo", "--vo", " <vo>" }; const Option opt_vidfile { Option::OPT_STR_LIST, "--vidfile", "-f", " <filename>" }; const Option opt_full { Option::OPT_BOOL, "--full", "-f", " <\"true\" or \"false\">" }; -const Option opt_rdonly { Option::OPT_BOOL, "--rdonly", "-r", " <\"true\" or \"false\">" }; +const Option opt_readonly { Option::OPT_BOOL, "--readonly", "-r", " <\"true\" or \"false\">" }; @@ -510,18 +510,18 @@ const std::map<cmd_key_t, cmd_val_t> cmdOptions = { {{ AdminCmd::CMD_STORAGECLASS, AdminCmd::SUBCMD_LS }, { }}, /*----------------------------------------------------------------------------------------------------*/ {{ AdminCmd::CMD_TAPE, AdminCmd::SUBCMD_ADD }, - { opt_vid, opt_mediatype, opt_vendor, opt_logicallibrary, opt_tapepool, opt_capacity, opt_disabled, opt_full, opt_rdonly, + { opt_vid, opt_mediatype, opt_vendor, opt_logicallibrary, opt_tapepool, opt_capacity, opt_disabled, opt_full, opt_readonly, opt_comment.optional() }}, {{ AdminCmd::CMD_TAPE, AdminCmd::SUBCMD_CH }, { opt_vid, opt_mediatype.optional(), opt_vendor.optional(), opt_logicallibrary.optional(), opt_tapepool.optional(), opt_capacity.optional(), opt_encryptionkey.optional(), opt_disabled.optional(), - opt_full.optional(), opt_rdonly.optional(), opt_comment.optional() }}, + opt_full.optional(), opt_readonly.optional(), opt_comment.optional() }}, {{ AdminCmd::CMD_TAPE, AdminCmd::SUBCMD_RM }, { opt_vid }}, {{ AdminCmd::CMD_TAPE, AdminCmd::SUBCMD_RECLAIM }, { opt_vid }}, {{ AdminCmd::CMD_TAPE, AdminCmd::SUBCMD_LS }, { opt_vid.optional(), opt_mediatype.optional(), opt_vendor.optional(), opt_logicallibrary.optional(), opt_tapepool.optional(), opt_vo.optional(), opt_capacity.optional(), - opt_disabled.optional(), opt_full.optional(), opt_rdonly.optional(), opt_all.optional() }}, + opt_disabled.optional(), opt_full.optional(), opt_readonly.optional(), opt_all.optional() }}, {{ AdminCmd::CMD_TAPE, AdminCmd::SUBCMD_LABEL }, { opt_vid, opt_force.optional() }}, /*----------------------------------------------------------------------------------------------------*/ diff --git a/continuousintegration/orchestration/tests/prepare_tests.sh b/continuousintegration/orchestration/tests/prepare_tests.sh index 7aa3d96a27ab5b8575986789cba96a0803eb4906..cfc81b8e1841f564b8720faa254ca89a1e5bb60d 100755 --- a/continuousintegration/orchestration/tests/prepare_tests.sh +++ b/continuousintegration/orchestration/tests/prepare_tests.sh @@ -96,7 +96,7 @@ echo "Preparing CTA configuration for tests" --vid ${VID} \ --disabled false \ --full false \ - --rdonly false \ + --readonly false \ --comment "ctasystest" done kubectl --namespace ${NAMESPACE} exec ctacli -- cta-admin storageclass add \ diff --git a/continuousintegration/orchestration/tests/simpletest.cli.sh b/continuousintegration/orchestration/tests/simpletest.cli.sh index dfb07f01b27c34197bd4b4018f7ec9de952fbe8a..7067d4ff5898062e4880d22a418ad9c61ba316a0 100755 --- a/continuousintegration/orchestration/tests/simpletest.cli.sh +++ b/continuousintegration/orchestration/tests/simpletest.cli.sh @@ -6,7 +6,7 @@ cta logicallibrary add --name VLSTK --comment "ctasystest" cta tapepool add --name ctasystest --partialtapesnumber 5 --encrypted false --comment "ctasystest" -cta tape add --logicallibrary VLSTK --tapepool ctasystest --capacity 1000000000 --comment "ctasystest" --vid ${VID} --disabled false --full false --rdonly false +cta tape add --logicallibrary VLSTK --tapepool ctasystest --capacity 1000000000 --comment "ctasystest" --vid ${VID} --disabled false --full false --readonly false cta storageclass add --instance root --name ctaStorageClass --copynb 1 --comment "ctasystest" diff --git a/continuousintegration/orchestration/tests/systest.sh b/continuousintegration/orchestration/tests/systest.sh index 18e8a51814448720bcd579ab6011ee5d8581d577..d020e2f4e29f8bb54a67ed4dad76522d21886ef3 100755 --- a/continuousintegration/orchestration/tests/systest.sh +++ b/continuousintegration/orchestration/tests/systest.sh @@ -78,7 +78,7 @@ echo "Preparing CTA for tests" --vid ${VID} \ --disabled false \ --full false \ - --rdonly false \ + --readonly false \ --comment "ctasystest" done kubectl --namespace ${NAMESPACE} exec ctacli -- cta storageclass add \ diff --git a/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh b/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh index f53751f502df8be81dce6640df130f650f328234..4f7d493c2468d95ce7d725cd3bd6ce2bab901a5f 100755 --- a/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh +++ b/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh @@ -78,7 +78,7 @@ for ((i=0; i<${#TAPES[@]}; i++)); do --vid ${VID} \ --disabled false \ --full false \ - --rdonly false \ + --readonly false \ --comment "ctasystest" done diff --git a/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh b/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh index a93bd8a6b6ce513897ed9eee82b45b9d5b1bb924..00c4b76db3de2794f45d39df8569d8772680f585 100755 --- a/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh +++ b/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh @@ -78,7 +78,7 @@ for ((i=0; i<${#TAPES[@]}; i++)); do --vid ${VID} \ --disabled false \ --full false \ - --rdonly false \ + --readonly false \ --comment "ctasystest" done