From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 5 Oct 2016 19:25:14 +0000 (+0200)
Subject: [5022] Updated DHCPv6 spec file with pool specific options.
X-Git-Tag: trac4631a_base~3^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0669681ec0d7d1cc6cbb23bbcbd314df366fd8e3;p=thirdparty%2Fkea.git

[5022] Updated DHCPv6 spec file with pool specific options.
---

diff --git a/src/bin/dhcp6/dhcp6.spec b/src/bin/dhcp6/dhcp6.spec
index 65ba301a83..0c3a74df72 100644
--- a/src/bin/dhcp6/dhcp6.spec
+++ b/src/bin/dhcp6/dhcp6.spec
@@ -441,17 +441,63 @@
                   "item_optional": false,
                   "item_default": 7200
                 },
-                { "item_name": "pool",
-                  "item_type": "list",
-                  "item_optional": false,
-                  "item_default": [],
-                    "list_item_spec":
-                    {
-                        "item_name": "type",
-                        "item_type": "string",
+                { "item_name": "pools",
+                  "item_type": "map",
+                  "item_optional": true,
+                  "item_default" : {},
+                  "map_item_spec": [
+                      { "item_name": "pool",
+                        "item_type": "list",
                         "item_optional": false,
-                        "item_default": ""
-                    }
+                        "item_default": [],
+                        "list_item_spec":
+                        {
+                            "item_name": "type",
+                            "item_type": "string",
+                            "item_optional": false,
+                            "item_default": ""
+                        }
+                      },
+                      { "item_name": "option-data",
+                        "item_type": "list",
+                        "item_optional": false,
+                        "item_default": [],
+                        "list_item_spec":
+                        {
+                            "item_name": "single-option-data",
+                            "item_type": "map",
+                            "item_optional": false,
+                            "item_default": {},
+                            "map_item_spec": [
+                                {
+                                    "item_name": "name",
+                                    "item_type": "string",
+                                    "item_optional": false,
+                                    "item_default": ""
+                                },
+
+                                { "item_name": "code",
+                                  "item_type": "integer",
+                                  "item_optional": false,
+                                  "item_default": 0
+                                },
+                                { "item_name": "data",
+                                  "item_type": "string",
+                                  "item_optional": false,
+                                  "item_default": ""
+                                },
+                                { "item_name": "csv-format",
+                                  "item_type": "boolean",
+                                  "item_optional": false,
+                                  "item_default": false
+                                },
+                                { "item_name": "space",
+                                  "item_type": "string",
+                                  "item_optional": false,
+                                  "item_default": "dhcp6"
+                                } ]
+                        }
+                      } ]
                 },
 
                 { "item_name": "client-class",
@@ -506,7 +552,48 @@
                            "item_type": "integer",
                            "item_optional": false,
                            "item_default": 128
-                       }]
+                       },
+                       {
+                           "item_name": "option-data",
+                           "item_type": "list",
+                           "item_optional": false,
+                           "item_default": [],
+                           "list_item_spec":
+                           {
+                               "item_name": "single-option-data",
+                               "item_type": "map",
+                               "item_optional": false,
+                               "item_default": {},
+                               "map_item_spec": [
+                                {
+                                    "item_name": "name",
+                                    "item_type": "string",
+                                    "item_optional": false,
+                                    "item_default": ""
+                                },
+
+                                { "item_name": "code",
+                                  "item_type": "integer",
+                                  "item_optional": false,
+                                  "item_default": 0
+                                },
+                                { "item_name": "data",
+                                  "item_type": "string",
+                                  "item_optional": false,
+                                  "item_default": ""
+                                },
+                                { "item_name": "csv-format",
+                                  "item_type": "boolean",
+                                  "item_optional": false,
+                                  "item_default": false
+                                },
+                                { "item_name": "space",
+                                  "item_type": "string",
+                                  "item_optional": false,
+                                  "item_default": "dhcp6"
+                                } ]
+                           }
+                       } ]
                     }
                 },
                 { "item_name": "option-data",