Add support for get_host_by_account_number query.

diff --git a/clients/moira/cluster.c b/clients/moira/cluster.c
index 85b6c8f45ca24ed3f7ca41b11265a89877eb2edd..157e387486b2b403f43b8009eaa895bc64b3bd03 100644 (file)
--- a/clients/moira/cluster.c
+++ b/clients/moira/cluster.c
@@ -2074,6 +2074,28 @@ struct mqelem *GetMachineByOwner(char *type, char *name)
   return QueueTop(elem);
 }
 
+int MachineByAcctNumber(int argc, char **argv)
+{
+  char *args[0], *account_number;
+  int status;
+  struct mqelem *elem = NULL;
+
+  if (GetValueFromUser("Account Number", &account_number) == SUB_ERROR)
+    return DM_NORMAL;
+
+  args[0] = account_number;
+  if (status = do_mr_query("get_host_by_account_number", 1, args, StoreInfo, 
+                          &elem))
+    {
+      com_err(program_name, status, " in get_host_by_account_number");
+      return DM_NORMAL;
+    }
+  Loop(QueueTop(elem), (void (*)(char **)) PrintMachInfo);
+  FreeQueue(elem);
+
+  return DM_NORMAL;
+}
+
 int ShowContainerInfo(int argc, char **argv)
 {
   struct mqelem *top;

diff --git a/clients/moira/f_defs.h b/clients/moira/f_defs.h
index c380dfcb8a79beaf8a351db12dcb7d0a2d3ece35..41534542c24d525d1109bb80167fdf77c709446a 100644 (file)
--- a/clients/moira/f_defs.h
+++ b/clients/moira/f_defs.h
@@ -47,6 +47,7 @@ int AttachHelp(void);
 int ShowMachineInfo(int argc, char **argv);
 int ShowMachineQuery(int argc, char **argv);
 int MachineByOwner(int argc, char **argv);
+int MachineByAcctNumber(int argc, char **argv);
 int AddMachine(int argc, char **argv);
 int UpdateMachine(int argc, char **argv);
 int DeleteMachine(int argc, char **argv);
@@ -86,7 +87,6 @@ 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 03c5df209c0a9b8a265444f54db8f2cd2985f4cd..32cfad2501ac5bd789ac5aca1909340d57bed354 100644 (file)
--- a/clients/moira/menus.c
+++ b/clients/moira/menus.c
@@ -510,7 +510,7 @@ Menu machine_menu = {
   NULLFUNC,
   NULLFUNC,
   "Machine Menu",
-  8,
+  9,
   {
     { ShowMachineInfo, NULLMENU, 2, {
       {"show", "Get machine information"},
@@ -524,6 +524,8 @@ Menu machine_menu = {
       {"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: "},
@@ -850,7 +852,7 @@ Menu container_menu = {
   NULLFUNC,
   NULLFUNC,
   "Container Menu",
-  8,
+  7,
   {
     { ShowContainerInfo, NULLMENU, 2, {
       {"show", "Get container information"},
@@ -872,7 +874,6 @@ 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)
   }