Changeset 552
- Timestamp:
- 02/20/07 14:33:00 (2 years ago)
- Files:
-
- trunk/src/vcc/vgc/Makefile.am (modified) (1 diff)
- trunk/src/vcc/vgc/cmd.c (modified) (2 diffs)
- trunk/src/vcc/vgc/cmd.h (modified) (1 diff)
- trunk/src/vcc/vgc/vg.c (moved) (moved from trunk/src/vcc/vgc/group.c) (3 diffs)
- trunk/src/vcc/vgc/vserver.c (deleted)
- trunk/src/vcc/vgc/vx.c (moved) (moved from trunk/src/vcc/vgc/wrapper.c) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/vcc/vgc/Makefile.am
r547 r552 23 23 24 24 libcmd_a_SOURCES = cmd.c \ 25 group.c \26 v server.c25 vg.c \ 26 vx.c trunk/src/vcc/vgc/cmd.c
r547 r552 23 23 24 24 cmd_t CMDS[] = { 25 { "add", cmd_groupadd }, 26 { "list", cmd_grouplist }, 27 { "remove", cmd_groupremove }, 28 { "vx.add", cmd_vserveradd }, 29 { "vx.list", cmd_vserverlist }, 30 { "vx.remove", cmd_vserverremove }, 31 { "vx.start", cmd_wrapperstart }, 32 { "vx.stop", cmd_wrapperstop }, 33 { NULL, NULL } 25 { "add", cmd_add }, 26 { "list", cmd_list }, 27 { "remove", cmd_remove }, 28 { "vx.start", cmd_vx_start }, 29 { "vx.stop", cmd_vx_stop }, 30 { NULL, NULL } 34 31 }; 35 32 … … 39 36 "\n" 40 37 "Available commands:\n" 41 " list\n" 42 " add <group>\n" 43 " remove <group>\n" 44 "\n" 45 " vx.list <group>\n" 46 " vx.add <group> <vserver>\n" 47 " vx.remove <group> <vserver>\n" 38 " add <group> [<name>]\n" 39 " list [<group>]\n" 40 " remove <group> [<name>]\n" 48 41 "\n" 49 42 " vx.start <group>\n" trunk/src/vcc/vgc/cmd.h
r547 r552 21 21 void usage(int rc); 22 22 23 void cmd_groupadd (xmlrpc_env *env, int argc, char **argv); 24 void cmd_grouplist (xmlrpc_env *env, int argc, char **argv); 25 void cmd_groupremove (xmlrpc_env *env, int argc, char **argv); 26 void cmd_vserveradd (xmlrpc_env *env, int argc, char **argv); 27 void cmd_vserverlist (xmlrpc_env *env, int argc, char **argv); 28 void cmd_vserverremove(xmlrpc_env *env, int argc, char **argv); 29 void cmd_wrapperstart (xmlrpc_env *env, int argc, char **argv); 30 void cmd_wrapperstop (xmlrpc_env *env, int argc, char **argv); 23 void cmd_add (xmlrpc_env *env, int argc, char **argv); 24 void cmd_list (xmlrpc_env *env, int argc, char **argv); 25 void cmd_remove (xmlrpc_env *env, int argc, char **argv); 26 void cmd_vx_start(xmlrpc_env *env, int argc, char **argv); 27 void cmd_vx_stop (xmlrpc_env *env, int argc, char **argv); 31 28 32 29 #endif trunk/src/vcc/vgc/vg.c
r547 r552 23 23 #include "cmd.h" 24 24 25 void cmd_grouplist(xmlrpc_env *env, int argc, char **argv) 25 void cmd_add(xmlrpc_env *env, int argc, char **argv) 26 { 27 if (argc < 1) 28 usage(EXIT_FAILURE); 29 30 char *group = argv[0]; 31 char *name = ""; 32 33 if (argc > 1) 34 name = argv[1]; 35 36 client_call("vg.add", "{s:s,s:s}", 37 "group", group, 38 "name", name); 39 } 40 41 void cmd_list(xmlrpc_env *env, int argc, char **argv) 26 42 { 27 43 xmlrpc_value *response, *result; 28 char *group name;29 int len, i , gid;44 char *group; 45 int len, i; 30 46 31 response = client_call 0("vg.list");47 response = client_call("vg.list", "{s:s}", "group", group); 32 48 return_if_fault(env); 33 49 … … 39 55 return_if_fault(env); 40 56 41 xmlrpc_decompose_value(env, result, 42 "{s:s,s:i,*}", 43 "groupname", &groupname, 44 "gid", &gid); 57 xmlrpc_decompose_value(env, result, "s", &group); 45 58 return_if_fault(env); 46 59 47 60 xmlrpc_DECREF(result); 48 61 49 printf("%s (gid=%d)\n", groupname, gid);62 printf("%s\n", group); 50 63 } 51 64 … … 53 66 } 54 67 55 void cmd_ groupadd(xmlrpc_env *env, int argc, char **argv)68 void cmd_remove(xmlrpc_env *env, int argc, char **argv) 56 69 { 57 client_call("vg.add", 58 "{s:s}", 59 "groupname", name); 70 if (argc < 1) 71 usage(EXIT_FAILURE); 72 73 char *group = argv[0]; 74 char *name = ""; 75 76 if (argc > 1) 77 name = argv[1]; 78 79 client_call("vg.remove", "{s:s,s:s}", 80 "group", group, 81 "name", name); 60 82 } 61 62 void cmd_groupremove(xmlrpc_env *env, int argc, char **argv)63 {64 client_call("vg.remove",65 "{s:s}",66 "groupname", name);67 }trunk/src/vcc/vgc/vx.c
r547 r552 16 16 // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 17 18 #include <stdlib.h> 19 20 #include "vcc.h" 18 21 #include "cmd.h" 19 22 20 void cmd_ wrapperstart(xmlrpc_env *env, int argc, char **argv)23 void cmd_vx_start(xmlrpc_env *env, int argc, char **argv) 21 24 { 22 xmlrpc_client_call(env, uri, "vg.vx.start", 23 SIGNATURE("{s:s}"), 24 "groupname", name); 25 if (argc < 1) 26 usage(EXIT_FAILURE); 27 28 char *group = argv[0]; 29 30 client_call("vg.vx.start", "{s:s}", "group", group); 25 31 } 26 32 27 void cmd_ wrapperstop(xmlrpc_env *env, int argc, char **argv)33 void cmd_vx_stop(xmlrpc_env *env, int argc, char **argv) 28 34 { 29 xmlrpc_client_call(env, uri, "vg.vx.stop", 30 SIGNATURE("{s:s}"), 31 "groupname", name); 35 if (argc < 1) 36 usage(EXIT_FAILURE); 37 38 char *group = argv[0]; 39 40 client_call("vg.vx.stop", "{s:s}", "group", group); 32 41 }
