struct string_list *next;
};
-/* It is important to membercmp that M_USER < M_LIST < M_STRING */
#define M_ANY 0
#define M_USER 1
#define M_LIST 2
-#define M_STRING 3
-#define M_KERBEROS 4
-#define M_NONE 5
+#define M_KERBEROS 3
+#define M_NONE 4
/* argument parsing macro */
#define argis(a, b) (!strcmp(*arg + 1, a) || !strcmp(*arg + 1, b))
/* flags from command line */
int info_flag, update_flag, create_flag, delete_flag, list_map_flag;
-int update_map_flag, verbose, noauth;
+int update_alias_flag, update_map_flag, verbose, noauth;
+int list_container_flag, update_container_flag;
struct string_list *alias_add_queue, *alias_remove_queue;
struct string_list *map_add_queue, *map_remove_queue;
+struct string_list *container_add_queue, *container_remove_queue;
char *hostname, *whoami;
char *newname, *address, *network, *h_status, *vendor, *model;
-char *os, *location, *contact, *adm_cmt, *op_cmt;
+char *os, *location, *contact, *billing_contact, *adm_cmt, *op_cmt;
struct owner_type *owner;
int store_host_info(int argc, char **argv, void *hint);
void show_host_info(char **argv);
int show_machine_in_cluster(int argc, char **argv, void *hint);
+int show_machine_in_container(int argc, char **argv, void *hint);
struct owner_type *parse_member(char *s);
struct string_list *add_to_string_list(struct string_list *old_list, char *s);
int wrap_mr_query(char *handle, int argc, char **argv,
/* clear all flags & lists */
info_flag = update_flag = create_flag = list_map_flag = update_map_flag = 0;
- verbose = noauth = 0;
+ update_alias_flag = verbose = noauth = 0;
+ list_container_flag = update_container_flag = 0;
newname = address = network = h_status = vendor = model = NULL;
- os = location = contact = adm_cmt = op_cmt = NULL;
+ os = location = contact = billing_contact = adm_cmt = op_cmt = NULL;
owner = NULL;
alias_add_queue = alias_remove_queue = NULL;
map_add_queue = map_remove_queue = NULL;
+ container_add_queue = container_remove_queue = NULL;
whoami = argv[0];
success = 1;
} else
usage(argv);
}
+ else if (argis("bc", "billingcontact")) {
+ if (arg - argv < argc - 1) {
+ arg++;
+ update_flag++;
+ billing_contact = *arg;
+ } else
+ usage(argv);
+ }
else if (argis("ac", "admcmt")) {
if (arg - argv < argc - 1) {
arg++;
alias_add_queue=add_to_string_list(alias_add_queue, *arg);
} else
usage(argv);
+ update_alias_flag++;
}
else if (argis("d", "aliasdelete")) {
if (arg - argv < argc - 1) {
alias_remove_queue=add_to_string_list(alias_remove_queue, *arg);
} else
usage(argv);
+ update_alias_flag++;
}
else if (argis("am", "addmap")) {
if (arg - argv < argc - 1) {
}
else if (argis("lm", "listmap"))
list_map_flag++;
+ else if (argis("acn", "addcontainer")) {
+ if (arg - argv < argc - 1) {
+ arg++;
+ container_add_queue =
+ add_to_string_list(container_add_queue, *arg);
+ } else
+ usage(argv);
+ update_container_flag++;
+ }
+ else if (argis("dcn", "deletecontainer")) {
+ if (arg - argv < argc - 1) {
+ arg++;
+ container_remove_queue =
+ add_to_string_list(container_remove_queue, *arg);
+ } else
+ usage(argv);
+ update_container_flag++;
+ }
+ else if (argis("lcn", "listcontainer"))
+ list_container_flag++;
else if (argis("n", "noauth"))
noauth++;
else if (argis("v", "verbose"))
/* default to info_flag if nothing else was specified */
if(!(info_flag || update_flag || create_flag || \
- delete_flag || list_map_flag || update_map_flag )) {
+ delete_flag || list_map_flag || update_map_flag || \
+ update_alias_flag || update_container_flag || \
+ list_container_flag)) {
info_flag++;
}
/* fire up Moira */
- status = mrcl_connect(server, "stella", 2, !noauth);
+ status = mrcl_connect(server, "stella", 7, !noauth);
if (status == MRCL_AUTH_ERROR)
{
com_err(whoami, 0, "Try the -noauth flag if you don't "
char *argv[30];
int cnt;
- for (cnt = 0; cnt < 15; cnt++) {
+ for (cnt = 0; cnt < 16; cnt++) {
argv[cnt] = "";
}
argv[4] = location;
if (contact)
argv[5] = contact;
+ if (billing_contact)
+ argv[6] = billing_contact;
/* The use field always gets set to "0" */
- argv[6] = "0";
+ argv[7] = "0";
if (h_status)
- argv[7] = h_status;
+ argv[8] = h_status;
else
- argv[7] = "1";
+ argv[8] = "1";
if (network)
- argv[8] = network;
+ argv[9] = network;
if (address)
- argv[9] = address;
+ argv[10] = address;
+ else
+ argv[10] = "unique";
if (adm_cmt)
- argv[12] = adm_cmt;
+ argv[13] = adm_cmt;
if (op_cmt)
- argv[13] = op_cmt;
+ argv[14] = op_cmt;
if (owner)
{
- argv[11] = owner->name;
+ argv[12] = owner->name;
switch (owner->type)
{
case M_ANY:
case M_USER:
- argv[10] = "USER";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ argv[11] = "USER";
+ status = wrap_mr_query("add_host", 15, argv, NULL, NULL);
if (owner->type != M_ANY || status != MR_USER)
break;
case M_LIST:
- argv[10] = "LIST";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ argv[11] = "LIST";
+ status = wrap_mr_query("add_host", 15, argv, NULL, NULL);
break;
case M_KERBEROS:
- argv[10] = "KERBEROS";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ argv[11] = "KERBEROS";
+ status = mrcl_validate_kerberos_member(argv[12], &argv[12]);
+ if (mrcl_get_message())
+ mrcl_com_err(whoami);
+ status = wrap_mr_query("add_host", 15, argv, NULL, NULL);
break;
case M_NONE:
- argv[10] = "NONE";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ argv[11] = "NONE";
+ status = wrap_mr_query("add_host", 15, argv, NULL, NULL);
break;
}
}
else
{
- argv[10] = "NONE";
argv[11] = "NONE";
+ argv[12] = "NONE";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ status = wrap_mr_query("add_host", 15, argv, NULL, NULL);
}
if (status)
argv[6] = old_argv[5];
argv[7] = old_argv[6];
argv[8] = old_argv[7];
- argv[9] = old_argv[9];
+ argv[9] = old_argv[8];
argv[10] = old_argv[10];
argv[11] = old_argv[11];
argv[12] = old_argv[12];
argv[13] = old_argv[13];
argv[14] = old_argv[14];
+ argv[15] = old_argv[15];
argv[0] = canonicalize_hostname(strdup(hostname));
if (newname)
argv[5] = location;
if (contact)
argv[6] = contact;
+ if (billing_contact)
+ argv[7] = billing_contact;
if (h_status)
- argv[8] = h_status;
+ argv[9] = h_status;
if (network)
- argv[9] = network;
+ argv[10] = network;
if (address)
- argv[10] = address;
+ argv[11] = address;
if (adm_cmt)
- argv[13] = adm_cmt;
+ argv[14] = adm_cmt;
if (op_cmt)
- argv[14] = op_cmt;
+ argv[15] = op_cmt;
if (owner)
{
- argv[12] = owner->name;
+ argv[13] = owner->name;
switch (owner->type)
{
case M_ANY:
case M_USER:
- argv[11] = "USER";
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ argv[12] = "USER";
+ status = wrap_mr_query("update_host", 16, argv, NULL, NULL);
if (owner->type != M_ANY || status != MR_USER)
break;
case M_LIST:
- argv[11] = "LIST";
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ argv[12] = "LIST";
+ status = wrap_mr_query("update_host", 16, argv, NULL, NULL);
break;
case M_KERBEROS:
- argv[11] = "KERBEROS";
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ argv[12] = "KERBEROS";
+ status = mrcl_validate_kerberos_member(argv[13], &argv[13]);
+ if (mrcl_get_message())
+ mrcl_com_err(whoami);
+ status = wrap_mr_query("update_host", 16, argv, NULL, NULL);
break;
case M_NONE:
- argv[11] = "NONE";
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ argv[12] = "NONE";
+ status = wrap_mr_query("update_host", 16, argv, NULL, NULL);
break;
}
}
else
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ status = wrap_mr_query("update_host", 16, argv, NULL, NULL);
if (status)
com_err(whoami, status, "while updating host.");
}
}
+ /* add container mappings */
+ if (container_add_queue) {
+ struct string_list *q = container_add_queue;
+
+ while (q) {
+ char *containername = q->string;
+ char *args[2];
+
+ args[0] = canonicalize_hostname(strdup(hostname));
+ args[1] = containername;
+ status = wrap_mr_query("add_machine_to_container", 2, args,
+ NULL, NULL);
+
+ if (status) {
+ com_err(whoami, status, "while adding container mapping");
+ exit(1);
+ }
+
+ q = q->next;
+ }
+ }
+
+ /* delete container mappings */
+ if (container_remove_queue) {
+ struct string_list *q = container_remove_queue;
+
+ while (q) {
+ char *containername = q->string;
+ char *args[2];
+
+ args[0] = canonicalize_hostname(strdup(hostname));
+ args[1] = containername;
+ status = wrap_mr_query("delete_machine_from_container", 2, args,
+ NULL, NULL);
+
+ if (status) {
+ com_err(whoami, status, "while deleting container mapping");
+ exit(1);
+ }
+
+ q = q->next;
+ }
+ }
+
/* display list info if requested to */
if (info_flag) {
struct mqelem *elem = NULL;
}
}
+ /* list container mappings if needed */
+ if (list_container_flag) {
+ char *argv[1];
+
+ argv[0] = canonicalize_hostname(strdup(hostname));
+ status = wrap_mr_query("get_machine_to_container_map", 1, argv,
+ show_machine_in_container, NULL);
+
+ if (status)
+ if (status != MR_NO_MATCH) {
+ com_err(whoami, status, "while getting container mappings");
+ exit(1);
+ }
+ }
+
if (delete_flag) {
char *argv[1];
fprintf(stderr, USAGE_OPTIONS_FORMAT, "-oc | -opcmt op_cmt",
"-c | -contact contact");
fprintf(stderr, USAGE_OPTIONS_FORMAT, "-ac | -admcmt adm_cmt",
- "-A | -address address");
- fprintf(stderr, USAGE_OPTIONS_FORMAT, "-am | -addmap cluster",
+ "-bc | -billingcontact billing_contact");
+ fprintf(stderr, USAGE_OPTIONS_FORMAT, "-A | -address address",
"-N | -network network");
- fprintf(stderr, USAGE_OPTIONS_FORMAT, "-dm | -deletemap cluster",
- "-lm | -listmap");
- fprintf(stderr, USAGE_OPTIONS_FORMAT, "-db | -database host[:port]",
- "-n | -noauth");
+ fprintf(stderr, USAGE_OPTIONS_FORMAT, "-am | -addmap cluster",
+ "-dm | deletemap cluster");
+ fprintf(stderr, USAGE_OPTIONS_FORMAT, "-acn | -addcontainer container",
+ "-dcn | -deletecontainer container");
+ fprintf(stderr, USAGE_OPTIONS_FORMAT, "-lm | -listmap",
+ "-lcn | -listcontainer");
fprintf(stderr, USAGE_OPTIONS_FORMAT, "-v | -verbose",
- "");
+ "-n | -noauth");
+ fprintf(stderr, " %-39s\n" , "-db | -database host[:port]");
exit(1);
}
printf("Status: %-16s Changed: %s\n",
MacState(atoi(argv[M_STAT])), argv[M_STAT_CHNG]);
printf("\n");
-
- printf("Vendor: %-16s Model: %-20s OS: %s\n",
- argv[M_VENDOR], argv[M_MODEL], argv[M_OS]);
- printf("Location: %-16s Contact: %-20s Opt: %s\n",
- argv[M_LOC], argv[M_CONTACT], argv[M_USE]);
+ printf("Vendor: %-16s Location: %s\n", argv[M_VENDOR],
+ argv[M_LOC]);
+ printf("Model: %-16s Contact: %s\n", argv[M_MODEL],
+ argv[M_CONTACT]);
+ printf("OS: %-16s Billing Contact: %s\n", argv[M_OS],
+ argv[M_BILL_CONTACT]);
+ printf("\nOpt: %s\n", argv[M_USE]);
printf("\nAdm cmt: %s\n", argv[M_ACOMMENT]);
printf("Op cmt: %s\n", argv[M_OCOMMENT]);
printf("\n");
return MR_CONT;
}
+int show_machine_in_container(int argc, char **argv, void *hint)
+{
+ printf("Machine: %-30s Container: %-25s\n", argv[0], argv[1]);
+
+ return MR_CONT;
+}
+
/* Parse a line of input, fetching a member. NULL is returned if a member
* is not found. ';' is a comment character.
*/
m->type = M_USER;
else if (!strcasecmp("list", s))
m->type = M_LIST;
- else if (!strcasecmp("string", s))
- m->type = M_STRING;
else if (!strcasecmp("kerberos", s))
m->type = M_KERBEROS;
else if (!strcasecmp("none", s))