Implement support for get_toplevel_containers query.

diff --git a/clients/moira/cluster.c b/clients/moira/cluster.c
index 6ce6c0d1c26ab9cc377184a220b6a4ebf12affab..eab1cf3bc4cd0f184660cc42c5ee4f6cfc8c8c3f 100644 (file)
--- a/clients/moira/cluster.c
+++ b/clients/moira/cluster.c
@@ -2462,3 +2462,18 @@ int GetMachinesOfContainer(int argc, char **argv)
   FreeQueue(top);
   return DM_NORMAL;
 }
+
+int GetTopLevelCont(int argc, char **argv)
+{
+  int status;
+  struct mqelem *elem = NULL;
+  if (status = do_mr_query("get_toplevel_containers", 0, NULL, StoreInfo, 
+                          &elem))
+    {
+      com_err(program_name, status, " in get_toplevel_containers");
+      return DM_NORMAL;
+    }
+  Loop(QueueTop(elem), (void(*)(char **)) PrintContainer);
+  FreeQueue(elem);
+  return DM_NORMAL;
+}

diff --git a/clients/moira/f_defs.h b/clients/moira/f_defs.h
index fc43b8ca9e2d18e983a7e7edb3c8d9dfa45042d3..c380dfcb8a79beaf8a351db12dcb7d0a2d3ece35 100644 (file)
--- a/clients/moira/f_defs.h
+++ b/clients/moira/f_defs.h
@@ -86,6 +86,7 @@ int MachineToContainerMap(int argc, char **argv);
 int AddMachineToContainer(int argc, char **argv);
 int RemoveMachineFromContainer(int argc, char **argv);
 int GetMachinesOfContainer(int argc, char **argv);
+int GetTopLevelCont(int argc, char **argv);
 
 /* delete.c */
 

diff --git a/clients/moira/menus.c b/clients/moira/menus.c
index 8e62152e85a9a700281aefb91cb162e611a55a01..03c5df209c0a9b8a265444f54db8f2cd2985f4cd 100644 (file)
--- a/clients/moira/menus.c
+++ b/clients/moira/menus.c
@@ -850,7 +850,7 @@ Menu container_menu = {
   NULLFUNC,
   NULLFUNC,
   "Container Menu",
-  7,
+  8,
   {
     { ShowContainerInfo, NULLMENU, 2, {
       {"show", "Get container information"},
@@ -872,6 +872,7 @@ Menu container_menu = {
       {"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)
   }