added fsgroup support

removed the verbos option from some of the longer menus

diff --git a/clients/moira/menus.c b/clients/moira/menus.c
index d6bbba3a7b833a9f36d2e6bf822c1dfd9aab3fef..02a89cd19d8a51bdb40cb411cbf2a7e16e3de131 100644 (file)
--- a/clients/moira/menus.c
+++ b/clients/moira/menus.c
@@ -188,6 +188,35 @@ Menu quota_menu = {
   } 
 };
 
+Menu fsgroup_menu = {
+    NULLFUNC,
+    NULLFUNC,
+    "Filesystem Group Menu",
+    6,
+    {
+       { GetFS, NULLMENU, 2, {
+           {"get", "Get individual or group filesystem information"},
+           {"name", "Name of Filesystem: "}
+       } },
+       { AddFSToGroup, NULLMENU, 3, {
+           {"add", "Add a new filesystem to an FS group"},
+           {"group", "FS Group name:"},
+           {"filsys", "Filesystem name:"}
+       } },
+       { RemoveFSFromGroup, NULLMENU, 3, {
+           {"remove", "Remove a filesystem from an FS group"},
+           {"group", "FS Group name:"},
+           {"filsys", "Filesystem name:"}
+       } },
+       { ChangeFSGroupOrder, NULLMENU, 2, {
+           {"order", "Change the order of filesystems in a group"},
+           {"group", "FS Group name:"}
+       } },
+       SIMPLEFUNC("help", "Info on Filesystem Groups", FSGroupHelp),
+       SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode)
+    }
+};
+
 Menu service_menu = {
     NULLFUNC,
     NULLFUNC,
@@ -307,7 +336,7 @@ Menu filesys_menu = {
   NULLFUNC, 
   NULLFUNC, 
   "Filesystem Menu",
-  10,
+  9,
   {
     { GetFS, NULLMENU, 2, {
       {"get", "Get Filesystem Name Information"},
@@ -325,6 +354,7 @@ Menu filesys_menu = {
       {"delete", "Delete Filesystem"},
       {"name", "Filesystem Name: "}
     } },
+    SUBMENU("fsgroups", "File System Groups Menu", &fsgroup_menu),
     { GetFSAlias, NULLMENU, 2, {
       {"check", "Check An Association"},
       {"name", "alias name : "}
@@ -338,8 +368,8 @@ Menu filesys_menu = {
       {"name", "alias name : "},
     } },
     SUBMENU("quotas","Quota Menu", &quota_menu),
-    SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode),
-    SIMPLEFUNC("help", "Help ..", AttachHelp)
+/*    SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode), */
+/*    SIMPLEFUNC("help", "Help ..", AttachHelp) */
   }
 };
 
@@ -382,7 +412,7 @@ Menu list_menu = {
     NULLFUNC,
     NULLFUNC,
     "List Menu",
-    10,
+    9,
     {
        { ShowListInfo, NULLMENU, 2, {
            {"show", "Display information about a list"},
@@ -410,7 +440,7 @@ Menu list_menu = {
        SUBMENU("list_info", "List Info Menu",
                &list_info_menu),
        SUBMENU("quotas","Quota Menu", &quota_menu),    
-       SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode),
+/*     SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode), */
        SIMPLEFUNC("help", "Print Help", ListHelp)
     } 
 };