added new volume key "id" to schema

Author: XaverStiensmeier

bibigrid/core/utility/validate_schema.py

@@ -19,6 +19,19 @@ def str_dict_or_none(d):
     return d
 
 
+VOLUMES = [{
+    Optional('name'): str,
+    Optional('id'): str,
+    Optional('snapshot'): str,  # optional; to create volume from
+    # one or none of these
+    Optional('permanent'): bool,
+    Optional('semiPermanent'): bool,
+    Optional('exists'): bool,
+    Optional('mountPoint'): str,
+    Optional('size'): int,
+    Optional('fstype'): str,
+    Optional('type'): str}]
+
 WORKER = {'type': str, 'image': str, Optional('count'): int, Optional('onDemand'): bool, Optional('partitions'): [str],
           Optional('features'): [str],
           Optional('securityGroups'): [str],
@@ -27,17 +40,7 @@ def str_dict_or_none(d):
               Optional('terminate'): bool,
               Optional('size'): int
           },
-          Optional('volumes'): [{
-              Optional('name'): str,
-              Optional('snapshot'): str,  # optional; to create volume from
-              # one or none of these
-              Optional('permanent'): bool,
-              Optional('semiPermanent'): bool,
-              Optional('exists'): bool,
-              Optional('mountPoint'): str,
-              Optional('size'): int,
-              Optional('fstype'): str,
-              Optional('type'): str}],
+          Optional('volumes'): VOLUMES,
           Optional('meta'): Use(str_dict_or_none)
           }
 
@@ -50,17 +53,7 @@ def str_dict_or_none(d):
                     Optional('terminate'): bool,
                     Optional('size'): int
                 },
-                Optional('volumes'): [{
-                    Optional('name'): str,
-                    Optional('snapshot'): str,  # optional; to create volume from
-                    # one or none of these
-                    Optional('permanent'): bool,
-                    Optional('semiPermanent'): bool,
-                    Optional('exists'): bool,
-                    Optional('mountPoint'): str,
-                    Optional('size'): int,
-                    Optional('fstype'): str,
-                    Optional('type'): str}],
+                Optional('volumes'): VOLUMES,
                 Optional('meta'): Use(str_dict_or_none)
                 }