diff options
Diffstat (limited to 'rpc/rpcl/block.x')
| -rw-r--r-- | rpc/rpcl/block.x | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/rpc/rpcl/block.x b/rpc/rpcl/block.x index 4d840ff..5d9c2a5 100644 --- a/rpc/rpcl/block.x +++ b/rpc/rpcl/block.x @@ -3,6 +3,17 @@ %#include "rpc-pragmas.h" #endif +enum JsonResponseFormat { + GB_JSON_NONE = 0, + + GB_JSON_PLAIN = 1, + GB_JSON_SPACED = 2, + GB_JSON_PRETTY = 3, + GB_JSON_DEFAULT = 4, + + GB_JSON_MAX +}; + struct blockCreate { char ipaddr[255]; char volume[255]; @@ -17,11 +28,13 @@ struct blockCreateCli { u_int mpath; /* HA request count */ char block_name[255]; string block_hosts<>; + enum JsonResponseFormat json_resp; }; struct blockDeleteCli { char block_name[255]; char volume[255]; + enum JsonResponseFormat json_resp; }; struct blockDelete { @@ -30,22 +43,31 @@ struct blockDelete { }; struct blockInfoCli { - char block_name[255]; - char volume[255]; + char block_name[255]; + char volume[255]; + enum JsonResponseFormat json_resp; }; struct blockListCli { - char volume[255]; - u_quad_t offset; /* dentry d_name offset */ + char volume[255]; + u_quad_t offset; /* dentry d_name offset */ + enum JsonResponseFormat json_resp; }; struct blockResponse { int exit; /* exit code of the command */ - string out<>; /* json output */ + string out<>; /* output; TODO: return respective objects */ u_quad_t offset; /* dentry d_name offset */ opaque xdata<>; /* future reserve */ }; +program GLUSTER_BLOCK { + version GLUSTER_BLOCK_VERS { + blockResponse BLOCK_CREATE(blockCreate) = 1; + blockResponse BLOCK_DELETE(blockDelete) = 2; + } = 1; +} = 21215311; /* B2 L12 O15 C3 K11 */ + program GLUSTER_BLOCK_CLI { version GLUSTER_BLOCK_CLI_VERS { blockResponse BLOCK_CREATE_CLI(blockCreateCli) = 1; @@ -54,10 +76,3 @@ program GLUSTER_BLOCK_CLI { blockResponse BLOCK_DELETE_CLI(blockDeleteCli) = 4; } = 1; } = 212153113; /* B2 L12 O15 C3 K11 C3 */ - -program GLUSTER_BLOCK { - version GLUSTER_BLOCK_VERS { - blockResponse BLOCK_CREATE(blockCreate) = 1; - blockResponse BLOCK_DELETE(blockDelete) = 2; - } = 1; -} = 21215311; /* B2 L12 O15 C3 K11 */ |