diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/chvol.c | 86 | ||||
-rw-r--r-- | src/eclat.c | 5 | ||||
-rw-r--r-- | src/eclat.h | 4 | ||||
-rw-r--r-- | src/lschvol.c | 68 |
5 files changed, 164 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e78461c..c4fc211 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,6 +21,7 @@ eclat_SOURCES=\ allocaddr.c\ asscaddr.c\ atvol.c\ + chvol.c\ cmdline.h\ config.c\ cpimg.c\ @@ -39,6 +40,7 @@ eclat_SOURCES=\ lsaddr.c\ lsattr.c\ lsaattr.c\ + lschvol.c\ lsiattr.c\ lsimg.c\ lsinst.c\ diff --git a/src/chvol.c b/src/chvol.c new file mode 100644 index 0000000..f1246c9 --- /dev/null +++ b/src/chvol.c @@ -0,0 +1,86 @@ +/* This file is part of Eclat. + Copyright (C) 2012-2018 Sergey Poznyakoff. + + Eclat is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + Eclat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Eclat. If not, see <http://www.gnu.org/licenses/>. */ + +#include "eclat.h" + +// eclat modvol VOLID [iops=V] [size=S] [type=V] + +char const *params[] = { + "iops", + "Iops", + "size", + "Size", + "type", + "VolumeType" +}; + +static char const * +getparam(char const *p, size_t len) +{ + int i; + + for (i = 0; i < sizeof(params) / sizeof(params[0]); i++) { + if (len == strlen(params[i]) + && memcmp(params[i], p, len) == 0) { + if (i % 2 == 0) + i++; + return params[i]; + } + } + return NULL; +} + +int +eclat_modify_volume(eclat_command_env_t *env, int argc, char **argv) +{ + int i; + struct ec2_request *q = env->request; + + generic_proginfo->args_doc = "VOL-ID [iops=V] [size=S] [type=V]"; + generic_parse_options(env->cmd, + "modify volume parameters", + argc, argv, &i); + argv += i; + argc -= i; + + if (argc == 0) + die(EX_USAGE, "wrong number of arguments"); + + translate_ids(1, argv, MAP_VOLUME); + eclat_request_add_param(q, "VolumeId", argv[0]); + for (i = 1; i < argc; i++) { + size_t len; + char const *param; + char const *value; + + len = strcspn(argv[i], "="); + param = getparam(argv[i], len); + if (!param) + die(EX_USAGE, "unrecognized parameter: %s", argv[i]); + if (argv[i][len]) { + value = argv[i] + len + 1; + } else { + i++; + if (i == argc) + die(EX_USAGE, "missing value for %s", + argv[i-1]); + value = argv[i]; + } + eclat_request_add_param(q, param, value); + } + return 0; +} + diff --git a/src/eclat.c b/src/eclat.c index 26a8f9f..43387be 100644 --- a/src/eclat.c +++ b/src/eclat.c @@ -208,7 +208,10 @@ struct eclat_command cmdtab[] = { { "disasrtab", "disassociate-route-table", "DisassociateRouteTable", eclat_disassociate_route_table, CMD_MOD }, { "route", NULL, NULL, eclat_route }, - + { "chvol", "modify-volume", "ModifyVolume", + eclat_modify_volume }, + { "lschvol", "describe-volumes-modifications", "DescribeVolumesModifications", + eclat_describe_volumes_modifications } }; size_t cmdcnt = sizeof(cmdtab) / sizeof(cmdtab[0]); diff --git a/src/eclat.h b/src/eclat.h index 1948234..f314476 100644 --- a/src/eclat.h +++ b/src/eclat.h @@ -157,6 +157,10 @@ int eclat_create_volume(eclat_command_env_t *env, int argc, char **argv); int eclat_delete_volume(eclat_command_env_t *env, int argc, char **argv); int eclat_attach_volume(eclat_command_env_t *env, int argc, char **argv); int eclat_detach_volume(eclat_command_env_t *env, int argc, char **argv); +int eclat_modify_volume(eclat_command_env_t *env, int argc, char **argv); +int eclat_describe_volumes_modifications(eclat_command_env_t *env, int argc, + char **argv); + int eclat_modify_instance_attribute(eclat_command_env_t *env, int argc, char **argv); int eclat_run_instances(eclat_command_env_t *env, int argc, char **argv); diff --git a/src/lschvol.c b/src/lschvol.c new file mode 100644 index 0000000..28e7dc2 --- /dev/null +++ b/src/lschvol.c @@ -0,0 +1,68 @@ +/* This file is part of Eclat. + Copyright (C) 2018 Sergey Poznyakoff. + + Eclat is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + Eclat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Eclat. If not, see <http://www.gnu.org/licenses/>. */ + +#include "eclat.h" + +static char *modification_state_enum[] = { + "modifying", + "optimizing", + "completed", + "failed", + NULL +}; + +static char *volume_type_enum[] = { + "standard", + "io1", + "gp2", + "sc1", + "st1", + NULL +}; + +static struct filter_descr filters[] = { + { "volume-id", FILTER_STRING }, + { "modification-state", FILTER_ENUM, modification_state_enum }, + { "target-size", FILTER_INT }, + { "target-iops", FILTER_INT }, + { "target-volume-type", FILTER_ENUM, volume_type_enum }, + { "original-size", FILTER_INT }, + { "original-iops", FILTER_INT }, + { "original-volume-type", FILTER_ENUM, volume_type_enum }, + { "start-time", FILTER_DATE }, + { NULL } +}; + +int +eclat_describe_volumes_modifications(eclat_command_env_t *env, int argc, + char **argv) +{ + int i; + + available_filters = filters; + generic_proginfo->print_help_hook = list_filters; + generic_proginfo->args_doc = "[FILTER...] [ID...]"; + generic_parse_options(env->cmd, + "describe current modifications status of EBS volumes", + argc, argv, &i); + argv += i; + argc -= i; + translate_ids(argc, argv, MAP_VOLUME); + + describe_request_create(env, argc, argv, "VolumeId"); + return 0; +} + |