X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/28064364a118e16541ff574e6da45f77340475b5..c7e6f1bd9a4bfe8db29c31fc3baafcdeb50c87d3:/clients/moira/menus.c diff --git a/clients/moira/menus.c b/clients/moira/menus.c index bf9d47dc..22fc7e07 100644 --- a/clients/moira/menus.c +++ b/clients/moira/menus.c @@ -77,6 +77,21 @@ Menu list_info_menu = { } }; +/* + * List Member Tags Menu + */ + +Menu list_tags_menu = { + NULL, + NULL, + "List Member Tags Menu", + 2, + { + SIMPLEFUNC("change", "Change the tag on a list member", TagMember), + SIMPLEFUNC("show", "Show all list members with tags", ListMembersWithTags), + } +}; + /* * List Member Menu */ @@ -85,7 +100,7 @@ Menu list_member_menu = { ListmaintMemberMenuEntry, ListmaintMemberMenuExit, NULL, - 7, + 8, { SIMPLEFUNC("add", "Add a member to this list", AddMember), SIMPLEFUNC("remove", "Remove a member from this list", DeleteMember), @@ -94,6 +109,7 @@ Menu list_member_menu = { SIMPLEFUNC("list", "Show the members of type LIST", ListListMembers), SIMPLEFUNC("string", "Show the members of type STRING", ListStringMembers), + SUBMENU("tags", "List Member Tags Menu", &list_tags_menu), SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode) } }; @@ -127,6 +143,38 @@ Menu mappings_menu = { } }; +/* + * Machine to Container Mappings Menu + */ + +Menu cmappings_menu = { + NULLFUNC, + NULLFUNC, + "Machine to Container Mappings Menu", + 5, + { + { MachineToContainerMap, NULLMENU, 2, { + {"map", "Show Machine to container mapping"}, + {"name", "Machine's Name: "} + } }, + { AddMachineToContainer, NULLMENU, 3, { + {"addcontainer", "Add machine to a container"}, + {"name", "Machine's Name: "}, + {"container", "Container's Name: "}, + } }, + { RemoveMachineFromContainer, NULLMENU, 3, { + {"remcontainer", "Remove machine from a container"}, + {"name", "Machine's Name: "}, + {"container", "Container's Name: "}, + } }, + { GetMachinesOfContainer, NULLMENU, 2, { + {"machofcont", "Show all machines in a container"}, + {"name", "Container's Name: "}, + } }, + SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode), + } +}; + /* * Post Office Box Menu */ @@ -135,7 +183,7 @@ Menu pobox_menu = { NULLFUNC, NULLFUNC, "Post Office Box Menu", - 4, + 5, { {GetUserPOBox, NULLMENU, 2, { {"show", "Show a user's post office box"}, @@ -145,6 +193,10 @@ Menu pobox_menu = { {"set", "Set (Add or Change) a user's post office box"}, {"login name", "login name: "} } }, + {SplitUserPOBox, NULLMENU, 2, { + {"split", "Split a user's post office box"}, + {"login name", "login name: "} + } }, {RemoveUserPOBox, NULLMENU, 2, { {"remove", "Remove a user's post office box"}, {"login name", "login name: "} @@ -288,6 +340,34 @@ Menu host_menu = { } }; +/* User Reservations Menu */ +Menu reservations_menu = { + NULLFUNC, + NULLFUNC, + "User Reservations Menu", + 4, + { + { GetUserReservations, NULLMENU, 2, { + { "get", "Get User Reservations" }, + { "login name", "User login name: " }, + } }, + { AddUserReservation, NULLMENU, 3, { + { "add", "Add User Reservation" }, + { "login name", "User login name: " }, + { "reservation", "Reservation: " }, + } }, + { DelUserReservation, NULLMENU, 3, { + { "delete", "Delete User Reservation" }, + { "login name", "User login name: " }, + { "reservation", "Reservation: " }, + } }, + { GetUserByReservation, NULLMENU, 2, { + { "getres", "Get Users by Reservation" }, + { "reservation", "Reservation: " }, + } }, + } +}; + /* ------------------------- First Tier Menus ------------------------- */ /* @@ -355,15 +435,15 @@ Menu filesys_menu = { SUBMENU("fsgroups", "File System Groups Menu", &fsgroup_menu), { GetFSAlias, NULLMENU, 2, { {"check", "Check An Association"}, - {"name", "alias name : "} + {"name", "Alias name: "} } }, { CreateFSAlias, NULLMENU, 2, { {"alias", "Associate with a Filesystem"}, - {"name", "alias name : "}, + {"name", "Alias name: "}, } }, { DeleteFSAlias, NULLMENU, 2, { {"unalias", "Disassociate from a Filesystem"}, - {"name", "alias name : "}, + {"name", "Alias name: "}, } }, SUBMENU("quotas", "Quota Menu", "a_menu), /* SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode), */ @@ -430,7 +510,7 @@ Menu machine_menu = { NULLFUNC, NULLFUNC, "Machine Menu", - 7, + 9, { { ShowMachineInfo, NULLMENU, 2, { {"show", "Get machine information"}, @@ -443,6 +523,9 @@ Menu machine_menu = { {"location", "Location (or leave empty to match any): "}, {"network", "Network (or leave empty to match any): "} } }, + SIMPLEFUNC("owner", "Lookup machines by owner", MachineByOwner), + SIMPLEFUNC("acctnumber", "Lookup machines by account number", + MachineByAcctNumber), { AddMachine, NULLMENU, 2, { {"add", "Add a new machine"}, {"network", "Network assignment: "}, @@ -565,7 +648,7 @@ Menu user_menu = { NULLFUNC, NULLFUNC, "User Menu", - 11, + 12, { {ShowUserByLogin, NULLMENU, 2, { {"login", "Show user information by login name"}, @@ -584,6 +667,7 @@ Menu user_menu = { {"id", "Show user information by ID number"}, {"ID number", "ID number: "} } }, + SIMPLEFUNC("sponsor", "Lookup users by sponsor", UserBySponsor), {UpdateUser, NULLMENU, 2, { {"modify", "Change all user fields"}, {"login", "Login name: "} @@ -601,6 +685,7 @@ Menu user_menu = { } }, SUBMENU("pobox", "Post Office Box Menu", &pobox_menu), SUBMENU("krbmap", "User Kerberos Mappings", &krbmap_menu), + SUBMENU("reservations", "User Reservations Menu", &reservations_menu), } }; @@ -620,6 +705,31 @@ Menu dcm_menu = { } }; +Menu printserver_menu = { + NULLFUNC, + NULLFUNC, + "Print Server Menu", + 4, + { + { GetPrintSrv, NULLMENU, 2, { + {"get", "Get Print Server Information"}, + {"name", "Name of server: "} + } }, + { AddPrintSrv, NULLMENU, 2, { + {"add", "Add a New Print Server"}, + {"name", "Name of server: "} + } }, + { ChangePrintSrv, NULLMENU, 2, { + {"change", "Modify a Print Server"}, + {"name", "Name of server: "} + } }, + { DelPrintSrv, NULLMENU, 2, { + {"delete", "Delete a Print Server"}, + {"name", "Name of server: "} + } } + } +}; + /* * Printer Menu */ @@ -628,7 +738,7 @@ Menu printer_menu = { NULLFUNC, NULLFUNC, "Printer Menu", - 10, + 11, { { GetPrn, NULLMENU, 2, { {"get", "Get Printer Information"}, @@ -669,11 +779,11 @@ Menu printer_menu = { { UpdateHWAddr, NULLMENU, 2, { {"hwaddr", "Update Printer Hardware Address"}, {"name", "Printer hostname: "} - } } + } }, + SUBMENU("server", "Print Servers Menu", &printserver_menu), } }; - /* * Zephyr Menu */ @@ -707,6 +817,69 @@ Menu zephyr_menu = { } }; +/* + * ACL Menu + */ + +Menu acl_menu = { + NULLFUNC, + NULLFUNC, + "Generic ACL Menu", + 3, + { + { GetACL, NULLMENU, 3, { + {"get", "Get ACL Information"}, + {"host", "Machine: "}, + {"target", "Target file: "} + } }, + { AddACL, NULLMENU, 3, { + {"add", "Add New ACL"}, + {"host", "Machine: "}, + {"target", "Target file: "} + } }, + { DeleteACL, NULLMENU, 3, { + {"delete", "Delete ACL"}, + {"host", "Machine: "}, + {"target", "Target file: "} + } }, + } +}; + +/* + * Container Menu + */ + +Menu container_menu = { + NULLFUNC, + NULLFUNC, + "Container Menu", + 8, + { + { ShowContainerInfo, NULLMENU, 2, { + {"show", "Get container information"}, + {"name", "Container's Name: "} + } }, + { AddContainer, NULLMENU, 2, { + {"add", "Add a new container"}, + {"name", "Container's Name: "} + } }, + { UpdateContainer, NULLMENU, 2, { + {"update", "Update container information"}, + {"name", "Container's Name: "} + } }, + { DeleteContainer, NULLMENU, 2, { + {"delete", "Delete this container"}, + {"name", "Container's Name: "} + } }, + { GetSubContainers, NULLMENU, 2, { + {"subcont", "Get subcontainers of container"}, + {"name", "Container's Name: "} + } }, + SIMPLEFUNC("toplevel", "Get all top level containers", GetTopLevelCont), + SUBMENU("mappings", "Machine to Container Mappings Menu", &cmappings_menu), + SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode) + } +}; /* * Miscellaneous Menu @@ -743,7 +916,7 @@ Menu moira_top_menu = { NULLFUNC, NULLFUNC, "Moira Database Manipulation", - 11, + 13, { SUBMENU("cluster", "Cluster Menu", &cluster_menu), SUBMENU("filesys", "Filesystem Menu", &filesys_menu), @@ -755,6 +928,8 @@ Menu moira_top_menu = { SUBMENU("user", "User Menu", &user_menu), SUBMENU("zephyr", "Zephyr ACLS Menu", &zephyr_menu), SUBMENU("dcm", "DCM Menu", &dcm_menu), + SUBMENU("acl", "Generic ACL Menu", &acl_menu), + SUBMENU("container", "Container Menu", &container_menu), SUBMENU("misc", "Miscellaneous Menu", &misc_menu) } };