Implement ModifyVolume and DescribeVolumesModifications

10 files changed, 263 insertions, 2 deletions

diff --git a/TODO b/TODO
index 3e45bda..f0b5579 100644
--- a/TODO
+++ b/TODO
@@ -106,2 +106,3 @@ DescribeTags                       lstag                      [X]        [X]
 DescribeVolumes                    lsvol                      [X]        [X]
+DescribeVolumesModifications       lschvol                    [X]        [ ]
 DescribeVolumeAttribute            -                          [ ]        [ ]
@@ -131,2 +132,3 @@ ModifySnapshotAttribute            setsattr                   [X]        [X]
 ModifySubnetAttribute              setsubnetattr              [X]        [ ]
+ModifyVolume                       chvol                      [X]        [ ]
 ModifyVolumeAttribute              -                          [ ]        [ ]
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 2376583..7d0b355 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -62,2 +62,3 @@ FLNFILES=\
  describe-volumes.fln\
+ describe-volumes-modifications.fln\
  describe-vpc-attribute.fln\
@@ -74,2 +75,3 @@ FLNFILES=\
  modify-subnet-attribute.fln\
+ modify-volume.fln\
  modify-vpc-attribute.fln\
diff --git a/etc/describe-volumes-modifications.fln b/etc/describe-volumes-modifications.fln
new file mode 100644
index 0000000..f752490
--- /dev/null
+++ b/etc/describe-volumes-modifications.fln
@@ -0,0 +1,49 @@
+/* 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/>. */
+
+if (.DescribeVolumesModificationsResponse.volumeModificationSet.item) {
+  for (var in .DescribeVolumesModificationsResponse.volumeModificationSet.item) {
+    print(var.volumeId,
+          " ",
+          var.modificationState,
+          " ",
+          var.progress,
+          "%\n");
+    if (var.targetSize) {
+      print("\tsize: ",
+            var.originalSize,
+            " => ",
+            var.targetSize,
+            "\n");
+    }
+    if (var.targetVolumeType) {
+      print("\ttype: ",
+            var.originalVolumeType,
+            " => ",
+            var.targetVolumeType,
+            "\n");
+    }
+    if (var.targetIops) {
+      print("\tiops:",
+            var.originalIops,
+            " => ",
+            var.targetIops,
+            "\n");
+    }
+  }
+}
+
+          
diff --git a/etc/modify-volume.fln b/etc/modify-volume.fln
new file mode 100644
index 0000000..6b04bec
--- /dev/null
+++ b/etc/modify-volume.fln
@@ -0,0 +1,45 @@
+/* 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/>. */
+
+if (.ModifyVolumeResponse.volumeModification) {
+  print(.ModifyVolumeResponse.volumeModification.volumeId,
+        ": ",
+        .ModifyVolumeResponse.volumeModification.modificationState,
+        " ",
+        .ModifyVolumeResponse.volumeModification.progress,
+        "%\n");
+  if (.ModifyVolumeResponse.volumeModification.targetSize) {
+    print("\tsize: ",
+          .ModifyVolumeResponse.volumeModification.originalSize,
+          " => ",
+          .ModifyVolumeResponse.volumeModification.targetSize,
+          "\n");
+  }
+  if (.ModifyVolumeResponse.volumeModification.targetVolumeType) {
+    print("\ttype: ",
+          .ModifyVolumeResponse.volumeModification.originalVolumeType,
+          " => ",
+          .ModifyVolumeResponse.volumeModification.targetVolumeType,
+          "\n");
+  }
+  if (.ModifyVolumeResponse.volumeModification.targetIops) {
+    print("\tiops: ",
+          .ModifyVolumeResponse.volumeModification.originalIops,
+          " => ",
+          .ModifyVolumeResponse.volumeModification.targetIops,
+          "\n");
+  }
+}       
\ No newline at end of file
diff --git a/lib/libeclat.h b/lib/libeclat.h
index 6f1acf6..285e045 100644
--- a/lib/libeclat.h
+++ b/lib/libeclat.h
@@ -85,3 +85,3 @@ struct ec2_param {
 
-#define EC2_API_VERSION "2014-06-15"
+#define EC2_API_VERSION "2016-11-15"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e78461c..c4fc211 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,2 +23,3 @@ eclat_SOURCES=\
  atvol.c\
+ chvol.c\
  cmdline.h\
@@ -41,2 +42,3 @@ eclat_SOURCES=\
  lsaattr.c\
+ lschvol.c\
  lsiattr.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;
+}