[schema] Improved address definition #45

Closes #45
openwisp · Mar 20, 2016 · 848e71e · 848e71e
1 parent 171511a
commit 848e71e
Show file tree

Hide file tree

Showing 2 changed files with 162 additions and 63 deletions.
diff --git a/netjsonconfig/backends/openwrt/schema.py b/netjsonconfig/backends/openwrt/schema.py
@@ -9,6 +9,43 @@
 
 schema = merge_config(default_schema, {
     "definitions": {
+        "other_address": {
+            "type": "object",
+            "title": "other",
+            "allOf": [
+                {"$ref": "#/definitions/base_address"},
+                {
+                    "type": "object",
+                    "properties": {
+                        "family": {"enum": ["ipv4", "ipv6"]},
+                        "proto": {
+                            "enum": [
+                                'ppp',
+                                'pppoe',
+                                'pppoa',
+                                '3g',
+                                'qmi',
+                                'ncm',
+                                'hnet',
+                                'pptp',
+                                '6in4',
+                                'aiccu',
+                                '6to4',
+                                '6rd',
+                                'dslite',
+                                'l2tp',
+                                'relay',
+                                'gre',
+                                'gretap',
+                                'grev6',
+                                'grev6tap',
+                                'none'
+                            ]
+                        }
+                    }
+                }
+            ]
+        },
         "interface_settings": {
             "properties": {
                 "network": {
@@ -19,33 +56,7 @@
                 },
                 "addresses": {
                     "items": {
-                        "properties": {
-                            "proto": {
-                                "enum": [
-                                    'dhcpv6',
-                                    'ppp',
-                                    'pppoe',
-                                    'pppoa',
-                                    '3g',
-                                    'qmi',
-                                    'ncm',
-                                    'hnet',
-                                    'pptp',
-                                    '6in4',
-                                    'aiccu',
-                                    '6to4',
-                                    '6rd',
-                                    'dslite',
-                                    'l2tp',
-                                    'relay',
-                                    'gre',
-                                    'gretap',
-                                    'grev6',
-                                    'grev6tap',
-                                    'none'
-                                ]
-                            }
-                        }
+                        "oneOf": [{"$ref": "#/definitions/other_address"}]
                     }
                 }
             }

diff --git a/netjsonconfig/schema.py b/netjsonconfig/schema.py
@@ -8,6 +8,125 @@
     "type": "object",
     "additionalProperties": True,
     "definitions": {
+        "base_address": {
+            "type": "object",
+            "additionalProperties": True,
+            "required": [
+                "proto",
+                "family",
+            ],
+            "properties": {
+                "proto": {
+                    "title": "protocol",
+                    "type": "string",
+                    "propertyOrder": 1,
+                },
+                "family": {
+                    "type": "string",
+                    "propertyOrder": 2,
+                }
+            }
+        },
+        "static_address": {
+            "type": "object",
+            "required": [
+                "address",
+                "mask"
+            ],
+            "properties": {
+                "address": {
+                    "type": "string",
+                    "propertyOrder": 3,
+                },
+                "mask": {
+                    "type": "integer",
+                    "propertyOrder": 4,
+                },
+                "gateway": {
+                    "type": "string",
+                    "propertyOrder": 5,
+                }
+            }
+        },
+        "ipv4_address": {
+            "type": "object",
+            "title": "ipv4",
+            "allOf": [
+                {"$ref": "#/definitions/base_address"},
+                {"$ref": "#/definitions/static_address"},
+                {
+                    "type": "object",
+                    "properties": {
+                        "proto": {"enum": ["static"]},
+                        "family": {"enum": ["ipv4"]},
+                        "address": {
+                            "minLength": 8,
+                            "maxLength": 16,
+                            "format": "ipv4",
+                        },
+                        "mask": {
+                            "minimum": 8,
+                            "maxmium": 32,
+                            "default": 24,
+                        },
+                        "gateway": {
+                            "minLength": 8,
+                            "maxLength": 16,
+                            "format": "ipv4",
+                        }
+                    }
+                }
+            ]
+        },
+        "ipv6_address": {
+            "type": "object",
+            "title": "ipv6",
+            "allOf": [
+                {"$ref": "#/definitions/base_address"},
+                {"$ref": "#/definitions/static_address"},
+                {
+                    "type": "object",
+                    "required": [
+                        "address",
+                        "mask"
+                    ],
+                    "properties": {
+                        "proto": {"enum": ["static"]},
+                        "family": {"enum": ["ipv6"]},
+                        "address": {
+                            "minLength": 3,
+                            "maxLength": 45,
+                            "format": "ipv6",
+                            "propertyOrder": 3,
+                        },
+                        "mask": {
+                            "minimum": 4,
+                            "maxmium": 128,
+                            "default": 64,
+                        },
+                        "gateway": {
+                            "minLength": 3,
+                            "maxLength": 45,
+                            "format": "ipv6",
+                        }
+                    }
+                }
+            ]
+        },
+        "dhcp_address": {
+            "type": "object",
+            "title": "DHCP",
+            "allOf": [
+                {"$ref": "#/definitions/base_address"},
+                {
+                    "type": "object",
+                    "properties": {
+                        "proto": {"enum": ["dhcp"]},
+                        "family": {"enum": ["ipv4", "ipv6"]}
+                    }
+                }
+            ]
+        },
         "interface_settings": {
             "type": "object",
             "title": "Interface settings",
@@ -55,43 +174,12 @@
                     "additionalItems": True,
                     "propertyOrder": 20,
                     "items": {
-                        "type": "object",
                         "title": "Address",
-                        "additionalProperties": True,
-                        "required": [
-                            "proto",
-                            "family"
-                        ],
-                        "properties": {
-                            "proto": {
-                                "type": "string",
-                                "enum": [
-                                    "static",
-                                    "dhcp"
-                                ],
-                                "propertyOrder": 1,
-                            },
-                            "family": {
-                                "type": "string",
-                                "enum": [
-                                    "ipv4",
-                                    "ipv6"
-                                ],
-                                "propertyOrder": 2,
-                            },
-                            "address": {
-                                "type": "string",
-                                "propertyOrder": 3,
-                            },
-                            "mask": {
-                                "type": "integer",
-                                "propertyOrder": 4,
-                            },
-                            "gateway": {
-                                "type": "string",
-                                "propertyOrder": 5,
-                            }
-                        }
+                        "oneOf": [
+                            {"$ref": "#/definitions/dhcp_address"},
+                            {"$ref": "#/definitions/ipv4_address"},
+                            {"$ref": "#/definitions/ipv6_address"},
+                        ]
                     }
                 }
             }