Merge "Improve the validation of 'nets' parameter"

2018-03-11 15:06:05 +00:00 · 2018-03-11 15:06:05 +00:00 · 22180be2d5
commit 22180be2d5
parent 382d2c3bd4 fa1eed9a79
1 changed files with 25 additions and 1 deletions
--- a/zun/api/validation/parameter_types.py
+++ b/zun/api/validation/parameter_types.py
@ -120,7 +120,31 @@ hints = {
 }

 nets = {
-    'type': ['array', 'null']
+    'type': ['array', 'null'],
+    'items': {
+        'type': 'object',
+        'properties': {
+            'network': {
+                'type': ['string'],
+                'minLength': 1,
+                'maxLength': 255,
+            },
+            'v4-fixed-ip': {
+                'type': ['string'],
+                'format': 'ipv4'
+            },
+            'v6-fixed-ip': {
+                'type': ['string'],
+                'format': 'ipv6'
+            },
+            'port': {
+                'type': ['string'],
+                'maxLength': 255,
+                'minLength': 1,
+            }
+        },
+        'additionalProperties': False
+    }
 }

 availability_zone = {