Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dCache
cta
Commits
925e9f8a
Commit
925e9f8a
authored
7 years ago
by
Michael Davis
Browse files
Options
Downloads
Patches
Plain Diff
[cta_frontend] Adds long option to enum mapping
parent
a72b0801
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmdline/CtaAdminCmdParse.hpp
+204
-50
204 additions, 50 deletions
cmdline/CtaAdminCmdParse.hpp
xroot_plugins/messages/cta_admin.proto
+47
-42
47 additions, 42 deletions
xroot_plugins/messages/cta_admin.proto
with
251 additions
and
92 deletions
cmdline/CtaAdminCmdParse.hpp
+
204
−
50
View file @
925e9f8a
...
...
@@ -37,44 +37,44 @@ typedef std::map<std::string, AdminCmd::SubCmd> subCmdLookup_t;
* Map short and long command names to Protocol Buffer enum values
*/
const
cmdLookup_t
cmdLookup
=
{
{
"admin"
,
AdminCmd
::
CMD_ADMIN
},
{
"ad"
,
AdminCmd
::
CMD_ADMIN
},
{
"adminhost"
,
AdminCmd
::
CMD_ADMINHOST
},
{
"ah"
,
AdminCmd
::
CMD_ADMINHOST
},
{
"archivefile"
,
AdminCmd
::
CMD_ARCHIVEFILE
},
{
"af"
,
AdminCmd
::
CMD_ARCHIVEFILE
},
{
"archiveroute"
,
AdminCmd
::
CMD_ARCHIVEROUTE
},
{
"ar"
,
AdminCmd
::
CMD_ARCHIVEROUTE
},
{
"drive"
,
AdminCmd
::
CMD_DRIVE
},
{
"dr"
,
AdminCmd
::
CMD_DRIVE
},
{
"groupmountrule"
,
AdminCmd
::
CMD_GROUPMOUNTRULE
},
{
"gmr"
,
AdminCmd
::
CMD_GROUPMOUNTRULE
},
{
"listpendingarchives"
,
AdminCmd
::
CMD_LISTPENDINGARCHIVES
},
{
"lpa"
,
AdminCmd
::
CMD_LISTPENDINGARCHIVES
},
{
"listpendingretrieves"
,
AdminCmd
::
CMD_LISTPENDINGRETRIEVES
},
{
"lpr"
,
AdminCmd
::
CMD_LISTPENDINGRETRIEVES
},
{
"logicallibrary"
,
AdminCmd
::
CMD_LOGICALLIBRARY
},
{
"ll"
,
AdminCmd
::
CMD_LOGICALLIBRARY
},
{
"mountpolicy"
,
AdminCmd
::
CMD_MOUNTPOLICY
},
{
"mp"
,
AdminCmd
::
CMD_MOUNTPOLICY
},
{
"repack"
,
AdminCmd
::
CMD_REPACK
},
{
"re"
,
AdminCmd
::
CMD_REPACK
},
{
"requestermountrule"
,
AdminCmd
::
CMD_REQUESTERMOUNTRULE
},
{
"rmr"
,
AdminCmd
::
CMD_REQUESTERMOUNTRULE
},
{
"showqueues"
,
AdminCmd
::
CMD_SHOWQUEUES
},
{
"sq"
,
AdminCmd
::
CMD_SHOWQUEUES
},
{
"shrink"
,
AdminCmd
::
CMD_SHRINK
},
{
"sh"
,
AdminCmd
::
CMD_SHRINK
},
{
"storageclass"
,
AdminCmd
::
CMD_STORAGECLASS
},
{
"sc"
,
AdminCmd
::
CMD_STORAGECLASS
},
{
"tape"
,
AdminCmd
::
CMD_TAPE
},
{
"ta"
,
AdminCmd
::
CMD_TAPE
},
{
"tapepool"
,
AdminCmd
::
CMD_TAPEPOOL
},
{
"tp"
,
AdminCmd
::
CMD_TAPEPOOL
},
{
"test"
,
AdminCmd
::
CMD_TEST
},
{
"te"
,
AdminCmd
::
CMD_TEST
},
{
"verify"
,
AdminCmd
::
CMD_VERIFY
},
{
"ve"
,
AdminCmd
::
CMD_VERIFY
}
{
"admin"
,
AdminCmd
::
CMD_ADMIN
},
{
"ad"
,
AdminCmd
::
CMD_ADMIN
},
{
"adminhost"
,
AdminCmd
::
CMD_ADMINHOST
},
{
"ah"
,
AdminCmd
::
CMD_ADMINHOST
},
{
"archivefile"
,
AdminCmd
::
CMD_ARCHIVEFILE
},
{
"af"
,
AdminCmd
::
CMD_ARCHIVEFILE
},
{
"archiveroute"
,
AdminCmd
::
CMD_ARCHIVEROUTE
},
{
"ar"
,
AdminCmd
::
CMD_ARCHIVEROUTE
},
{
"drive"
,
AdminCmd
::
CMD_DRIVE
},
{
"dr"
,
AdminCmd
::
CMD_DRIVE
},
{
"groupmountrule"
,
AdminCmd
::
CMD_GROUPMOUNTRULE
},
{
"gmr"
,
AdminCmd
::
CMD_GROUPMOUNTRULE
},
{
"listpendingarchives"
,
AdminCmd
::
CMD_LISTPENDINGARCHIVES
},
{
"lpa"
,
AdminCmd
::
CMD_LISTPENDINGARCHIVES
},
{
"listpendingretrieves"
,
AdminCmd
::
CMD_LISTPENDINGRETRIEVES
},
{
"lpr"
,
AdminCmd
::
CMD_LISTPENDINGRETRIEVES
},
{
"logicallibrary"
,
AdminCmd
::
CMD_LOGICALLIBRARY
},
{
"ll"
,
AdminCmd
::
CMD_LOGICALLIBRARY
},
{
"mountpolicy"
,
AdminCmd
::
CMD_MOUNTPOLICY
},
{
"mp"
,
AdminCmd
::
CMD_MOUNTPOLICY
},
{
"repack"
,
AdminCmd
::
CMD_REPACK
},
{
"re"
,
AdminCmd
::
CMD_REPACK
},
{
"requestermountrule"
,
AdminCmd
::
CMD_REQUESTERMOUNTRULE
},
{
"rmr"
,
AdminCmd
::
CMD_REQUESTERMOUNTRULE
},
{
"showqueues"
,
AdminCmd
::
CMD_SHOWQUEUES
},
{
"sq"
,
AdminCmd
::
CMD_SHOWQUEUES
},
{
"shrink"
,
AdminCmd
::
CMD_SHRINK
},
{
"sh"
,
AdminCmd
::
CMD_SHRINK
},
{
"storageclass"
,
AdminCmd
::
CMD_STORAGECLASS
},
{
"sc"
,
AdminCmd
::
CMD_STORAGECLASS
},
{
"tape"
,
AdminCmd
::
CMD_TAPE
},
{
"ta"
,
AdminCmd
::
CMD_TAPE
},
{
"tapepool"
,
AdminCmd
::
CMD_TAPEPOOL
},
{
"tp"
,
AdminCmd
::
CMD_TAPEPOOL
},
{
"test"
,
AdminCmd
::
CMD_TEST
},
{
"te"
,
AdminCmd
::
CMD_TEST
},
{
"verify"
,
AdminCmd
::
CMD_VERIFY
},
{
"ve"
,
AdminCmd
::
CMD_VERIFY
}
};
...
...
@@ -83,22 +83,176 @@ const cmdLookup_t cmdLookup = {
* Map subcommand names to Protocol Buffer enum values
*/
const
subCmdLookup_t
subCmdLookup
=
{
{
"add"
,
AdminCmd
::
SUBCMD_ADD
},
{
"ch"
,
AdminCmd
::
SUBCMD_CH
},
{
"err"
,
AdminCmd
::
SUBCMD_ERR
},
{
"label"
,
AdminCmd
::
SUBCMD_LABEL
},
{
"ls"
,
AdminCmd
::
SUBCMD_LS
},
{
"reclaim"
,
AdminCmd
::
SUBCMD_RECLAIM
},
{
"rm"
,
AdminCmd
::
SUBCMD_RM
},
{
"up"
,
AdminCmd
::
SUBCMD_UP
},
{
"down"
,
AdminCmd
::
SUBCMD_DOWN
},
{
"read"
,
AdminCmd
::
SUBCMD_READ
},
{
"write"
,
AdminCmd
::
SUBCMD_WRITE
},
{
"write_auto"
,
AdminCmd
::
SUBCMD_WRITE_AUTO
}
{
"add"
,
AdminCmd
::
SUBCMD_ADD
},
{
"ch"
,
AdminCmd
::
SUBCMD_CH
},
{
"err"
,
AdminCmd
::
SUBCMD_ERR
},
{
"label"
,
AdminCmd
::
SUBCMD_LABEL
},
{
"ls"
,
AdminCmd
::
SUBCMD_LS
},
{
"reclaim"
,
AdminCmd
::
SUBCMD_RECLAIM
},
{
"rm"
,
AdminCmd
::
SUBCMD_RM
},
{
"up"
,
AdminCmd
::
SUBCMD_UP
},
{
"down"
,
AdminCmd
::
SUBCMD_DOWN
},
{
"read"
,
AdminCmd
::
SUBCMD_READ
},
{
"write"
,
AdminCmd
::
SUBCMD_WRITE
},
{
"write_auto"
,
AdminCmd
::
SUBCMD_WRITE_AUTO
}
};
/*!
* Map boolean options to Protocol Buffer enum values
*/
const
std
::
map
<
std
::
string
,
OptionBoolean
::
Key
>
boolOptions
=
{
// Boolean options
{
"--all"
,
OptionBoolean
::
BOOL_ALL
},
{
"--disabled"
,
OptionBoolean
::
BOOL_DISABLED
},
{
"--encrypted"
,
OptionBoolean
::
BOOL_ENCRYPTED
},
{
"--force"
,
OptionBoolean
::
BOOL_FORCE
},
{
"--full"
,
OptionBoolean
::
BOOL_FULL
},
{
"--lbp"
,
OptionBoolean
::
BOOL_LBP
},
// hasOption options
{
"--checkchecksum"
,
OptionBoolean
::
BOOL_CHECK_CHECKSUM
},
{
"--extended"
,
OptionBoolean
::
BOOL_EXTENDED
},
{
"--header"
,
OptionBoolean
::
BOOL_SHOW_HEADER
},
{
"--justexpand"
,
OptionBoolean
::
BOOL_JUSTEXPAND
},
{
"--justrepack"
,
OptionBoolean
::
BOOL_JUSTREPACK
},
{
"--summary"
,
OptionBoolean
::
BOOL_SUMMARY
}
};
/*!
* Map integer options to Protocol Buffer enum values
*/
const
std
::
map
<
std
::
string
,
OptionInteger
::
Key
>
intOptions
=
{
{
"--archivepriority"
,
OptionInteger
::
INT_ARCHIVE_PRIORITY
},
{
"--capacity"
,
OptionInteger
::
INT_CAPACITY
},
{
"--copynb"
,
OptionInteger
::
INT_COPY_NUMBER
},
{
"--firstfseq"
,
OptionInteger
::
INT_FIRST_FSEQ
},
{
"--id"
,
OptionInteger
::
INT_ARCHIVE_FILE_ID
},
{
"--lastfseq"
,
OptionInteger
::
INT_LAST_FSEQ
},
{
"--maxdrivesallowed"
,
OptionInteger
::
INT_MAX_DRIVES_ALLOWED
},
{
"--minarchiverequestage"
,
OptionInteger
::
INT_MIN_ARCHIVE_REQUEST_AGE
},
{
"--minretrieverequestage"
,
OptionInteger
::
INT_MIN_RETRIEVE_REQUEST_AGE
},
{
"--number"
,
OptionInteger
::
INT_NUMBER_OF_FILES
},
{
"--partial"
,
OptionInteger
::
INT_PARTIAL
},
{
"--partialtapesnumber"
,
OptionInteger
::
INT_PARTIAL_TAPES_NUMBER
},
{
"--retrievepriority"
,
OptionInteger
::
INT_RETRIEVE_PRIORITY
},
{
"--size"
,
OptionInteger
::
INT_FILE_SIZE
}
};
/*!
* Map string options to Protocol Buffer enum values
*/
const
std
::
map
<
std
::
string
,
OptionString
::
Key
>
strOptions
=
{
{
"--comment"
,
OptionString
::
STR_COMMENT
},
{
"--diskid"
,
OptionString
::
STR_DISKID
},
{
"--drive"
,
OptionString
::
STR_DRIVE
},
{
"--encryptionkey"
,
OptionString
::
STR_ENCRYPTION_KEY
},
{
"--file"
,
OptionString
::
STR_FILENAME
},
{
"--group"
,
OptionString
::
STR_GROUP
},
{
"--hostname"
,
OptionString
::
STR_HOSTNAME
},
{
"--input"
,
OptionString
::
STR_INPUT
},
{
"--instance"
,
OptionString
::
STR_INSTANCE
},
{
"--logicallibrary"
,
OptionString
::
STR_LOGICAL_LIBRARY
},
{
"--mountpolicy"
,
OptionString
::
STR_MOUNT_POLICY
},
{
"--output"
,
OptionString
::
STR_OUTPUT
},
{
"--owner"
,
OptionString
::
STR_OWNER
},
{
"--path"
,
OptionString
::
STR_PATH
},
{
"--storageclass"
,
OptionString
::
STR_STORAGE_CLASS
},
{
"--tag"
,
OptionString
::
STR_TAG
},
{
"--tapepool"
,
OptionString
::
STR_TAPE_POOL
},
{
"--username"
,
OptionString
::
STR_USERNAME
},
{
"--vid"
,
OptionString
::
STR_VID
}
};
#if 0
/*!
* Map option names to Protocol Buffer enum values
*/
//const subCmdLookup_t subCmdLookup = {
BoolValue("-d", "--disabled", false, false);
BoolValue("-d", "--disabled", true, false);
BoolValue("-e", "--encrypted", false, false);
BoolValue("-e", "--encrypted", true, false);
BoolValue("-f", "--force", false, true, "false");
BoolValue("-f", "--full", false, false);
BoolValue("-f", "--full", true, false);
BoolValue("-l", "--lbp", false, true, "true");
BoolValue("-p", "--lbp", false, false);
StringValue("", "--checksumtype", true, false));
StringValue("", "--checksumvalue", true, false));
StringValue("-d", "--diskid", false, false);
StringValue("-d", "--drive", true, false);
StringValue("", "--diskfilegroup", true, false);
StringValue("", "--diskfileowner", true, false);
StringValue("", "--diskfilepath", true, false);
StringValue("", "--diskid", true, false);
StringValue("", "--dsturl", true, false);
StringValue("-f", "--file", true, false);
StringValue("-g", "--group", false, false);
StringValue("", "--group", true, false);
StringValue("-i", "--input", true, false);
StringValue("-i", "--instance", false, false);
StringValue("-i", "--instance", true, false);
StringValue("-k", "--encryptionkey", false, false);
StringValue("-l", "--logicallibrary", false, false);
StringValue("-l", "--logicallibrary", true, false);
StringValue("-m", "--comment", false, false);
StringValue("-m", "--comment", true, false);
StringValue("-m", "--comment", true, true, "-");
StringValue("-n", "--name", true, false);
StringValue("-o", "--output", true, false);
StringValue("-o", "--owner", false, false);
StringValue("-p", "--path", false, false);
StringValue("", "--recoveryblob", true, false);
StringValue("", "--reportURL", false, true, "null:");
StringValue("", "--srcurl", true, false);
StringValue("-s", "--storageclass", false, false);
StringValue("-s", "--storageclass", true, false);
StringValue("", "--storageclass", true, false);
StringValue("-t", "--tag", false, false);
StringValue("-t", "--tag", false, false);
StringValue("-t", "--tapepool", false, false);
StringValue("-t", "--tapepool", true, false);
StringValue("-u", "--mountpolicy", false, false);
StringValue("-u", "--mountpolicy", true, false);
StringValue("", "--user", true, false);
StringValue("-u", "--username", true, false);
StringValue("-v", "--vid", false, false);
StringValue("-v", "--vid", true, false);
Uint64Value("--aa", "--minarchiverequestage", false, false);
Uint64Value("--aa", "--minarchiverequestage", true, false);
Uint64Value("--ap", "--archivepriority", false, false);
Uint64Value("--ap", "--archivepriority", true, false);
Uint64Value("-c", "--capacity", false, false);
Uint64Value("-c", "--capacity", true, false);
Uint64Value("-c", "--copynb", false, false);
Uint64Value("-c", "--copynb", true, false);
Uint64Value("-d", "--maxdrivesallowed", false, false);
Uint64Value("-d", "--maxdrivesallowed", true, false);
Uint64Value("-f", "--firstfseq", true, false);
Uint64Value("", "--id", true, false);
Uint64Value("-I", "--id", false, false);
Uint64Value("-l", "--lastfseq", true, false);
Uint64Value("-n", "--number", true, false);
Uint64Value("-p", "--partial", false, false); //nullopt means do a complete verification
Uint64Value("-p", "--partialtapesnumber", false, false);
Uint64Value("-p", "--partialtapesnumber", true, false);
Uint64Value("--ra", "--minretrieverequestage", false, false);
Uint64Value("--ra", "--minretrieverequestage", true, false);
Uint64Value("--rp", "--retrievepriority", false, false);
Uint64Value("--rp", "--retrievepriority", true, false);
Uint64Value("", "--size", true, false);
Uint64Value("-s", "--size", true, false);
#endif
/*!
* Help text structure
*/
...
...
This diff is collapsed.
Click to expand it.
xroot_plugins/messages/cta_admin.proto
+
47
−
42
View file @
925e9f8a
...
...
@@ -23,16 +23,20 @@ package cta.admin;
message
OptionBoolean
{
enum
Key
{
ALL
=
0
;
CHECK_CHECKSUM
=
1
;
DISABLED
=
2
;
ENCRYPTED
=
3
;
FORCE
=
4
;
FULL
=
5
;
JUSTEXPAND
=
6
;
JUSTREPACK
=
7
;
LBP
=
8
;
SHOW_HEADER
=
9
;
BOOL_DISABLED
=
0
;
BOOL_ENCRYPTED
=
1
;
BOOL_FORCE
=
2
;
BOOL_FULL
=
3
;
BOOL_LBP
=
4
;
// hasOption options
BOOL_ALL
=
5
;
BOOL_CHECK_CHECKSUM
=
6
;
BOOL_EXTENDED
=
7
;
BOOL_SHOW_HEADER
=
8
;
BOOL_JUSTEXPAND
=
9
;
BOOL_JUSTREPACK
=
10
;
BOOL_SUMMARY
=
11
;
}
Key
key
=
1
;
...
...
@@ -41,18 +45,20 @@ message OptionBoolean {
message
OptionInteger
{
enum
Key
{
ARCHIVE_FILE_ID
=
0
;
ARCHIVE_PRIORITY
=
1
;
RETRIEVE_PRIORITY
=
2
;
CAPACITY
=
3
;
COPY_NUMBER
=
4
;
FIRST_FSEQ
=
5
;
LAST_FSEQ
=
6
;
MAX_DRIVES_ALLOWED
=
7
;
MIN_ARCHIVE_REQUEST_AGE
=
8
;
MIN_RETRIEVE_REQUEST_AGE
=
9
;
NUMBER_OF_FILES
=
10
;
PARTIAL_TAPES_NUMBER
=
11
;
INT_ARCHIVE_FILE_ID
=
0
;
INT_ARCHIVE_PRIORITY
=
1
;
INT_RETRIEVE_PRIORITY
=
2
;
INT_CAPACITY
=
3
;
INT_COPY_NUMBER
=
4
;
INT_FIRST_FSEQ
=
5
;
INT_FILE_SIZE
=
6
;
INT_LAST_FSEQ
=
7
;
INT_MAX_DRIVES_ALLOWED
=
8
;
INT_MIN_ARCHIVE_REQUEST_AGE
=
9
;
INT_MIN_RETRIEVE_REQUEST_AGE
=
10
;
INT_NUMBER_OF_FILES
=
11
;
INT_PARTIAL
=
12
;
INT_PARTIAL_TAPES_NUMBER
=
13
;
}
Key
key
=
1
;
...
...
@@ -61,26 +67,25 @@ message OptionInteger {
message
OptionString
{
enum
Key
{
COMMENT
=
0
;
DISKID
=
1
;
DRIVE
=
2
;
ENCRYPTION_KEY
=
3
;
FILENAME
=
4
;
GROUP
=
5
;
HOSTNAME
=
6
;
INPUT
=
7
;
INSTANCE
=
8
;
LOGICAL_LIBRARY
=
9
;
MOUNT_POLICY
=
10
;
OUTPUT
=
11
;
OWNER
=
12
;
PATH
=
13
;
SIZE
=
14
;
STORAGE_CLASS
=
15
;
TAG
=
16
;
TAPE_POOL
=
17
;
USERNAME
=
18
;
VID
=
19
;
STR_COMMENT
=
0
;
STR_DISKID
=
1
;
STR_DRIVE
=
2
;
STR_ENCRYPTION_KEY
=
3
;
STR_FILENAME
=
4
;
STR_GROUP
=
5
;
STR_HOSTNAME
=
6
;
STR_INPUT
=
7
;
STR_INSTANCE
=
8
;
STR_LOGICAL_LIBRARY
=
9
;
STR_MOUNT_POLICY
=
10
;
STR_OUTPUT
=
11
;
STR_OWNER
=
12
;
STR_PATH
=
13
;
STR_STORAGE_CLASS
=
14
;
STR_TAG
=
15
;
STR_TAPE_POOL
=
16
;
STR_USERNAME
=
17
;
STR_VID
=
18
;
}
Key
key
=
1
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment