[3628] Updated dhcp4.spec and dhcp6.spec for host reservations.

diff --git a/src/bin/dhcp4/dhcp4.spec b/src/bin/dhcp4/dhcp4.spec
index c0918bbc0dfb22103b5c61b257d707a2ae5a3c17..b3f7edd8ecad51f0bfc26bb0d311da8110082334 100644 (file)
--- a/src/bin/dhcp4/dhcp4.spec
+++ b/src/bin/dhcp4/dhcp4.spec
@@ -93,7 +93,7 @@
           { "item_name": "array",
             "item_type": "boolean",
             "item_optional": false,
-            "item_default": False
+            "item_default": false
           },
 
           { "item_name": "record-types",
@@ -147,7 +147,7 @@
           { "item_name": "csv-format",
             "item_type": "boolean",
             "item_optional": false,
-            "item_default": False
+            "item_default": false
           },
           { "item_name": "space",
             "item_type": "string",
@@ -316,7 +316,7 @@
                     { "item_name": "csv-format",
                       "item_type": "boolean",
                       "item_optional": false,
-                      "item_default": False
+                      "item_default": false
                       },
                     { "item_name": "space",
                       "item_type": "string",
@@ -324,6 +324,43 @@
                       "item_default": "dhcp4"
                     } ]
                   }
+                },
+                { "item_name": "reservations",
+                  "item_type": "list",
+                  "item_optional": false,
+                  "item_default": [],
+                  "list_item_spec":
+                  {
+                      "item_name": "reservation",
+                      "item_type": "map",
+                      "item_optional": false,
+                      "item_default": {},
+                      "map_item_spec": [
+                      {
+                        "item_name": "hw-address",
+                        "item_type": "string",
+                        "item_optional": false,
+                        "item_default": ""
+                      },
+                      {
+                        "item_name": "duid",
+                        "item_type": "string",
+                        "item_optional": false,
+                        "item_default": ""
+                      },
+                      {
+                        "item_name": "hostname",
+                        "item_type": "string",
+                        "item_optional": false,
+                        "item_default": ""
+                      },
+                      {
+                        "item_name": "ip-address",
+                        "item_type": "string",
+                        "item_optional": false,
+                        "item_default": "0.0.0.0"
+                      } ]
+                  }
                 } ]
          }
       },

diff --git a/src/bin/dhcp6/dhcp6.spec b/src/bin/dhcp6/dhcp6.spec
index 174170f850ebc77dc10e4e4369c94b5006d6a02b..b70c61f0b012dc897edc8ee2bac133b152146b5c 100644 (file)
--- a/src/bin/dhcp6/dhcp6.spec
+++ b/src/bin/dhcp6/dhcp6.spec
@@ -87,7 +87,7 @@
           { "item_name": "array",
             "item_type": "boolean",
             "item_optional": false,
-            "item_default": False
+            "item_default": false
           },
 
           { "item_name": "record-types",
@@ -141,7 +141,7 @@
           { "item_name": "csv-format",
             "item_type": "boolean",
             "item_optional": false,
-            "item_default": False
+            "item_default": false
           },
           { "item_name": "space",
             "item_type": "string",
@@ -354,7 +354,7 @@
                     { "item_name": "csv-format",
                       "item_type": "boolean",
                       "item_optional": false,
-                      "item_default": False
+                      "item_default": false
                     },
                     { "item_name": "space",
                       "item_type": "string",
@@ -362,6 +362,63 @@
                       "item_default": "dhcp6"
                     } ]
                   }
+                },
+                { "item_name": "reservations",
+                  "item_type": "list",
+                  "item_optional": false,
+                  "item_default": [],
+                  "list_item_spec":
+                  {
+                      "item_name": "reservation",
+                      "item_type": "map",
+                      "item_optional": false,
+                      "item_default": {},
+                      "map_item_spec": [
+                      {
+                        "item_name": "hw-address",
+                        "item_type": "string",
+                        "item_optional": false,
+                        "item_default": ""
+                      },
+                      {
+                        "item_name": "duid",
+                        "item_type": "string",
+                        "item_optional": false,
+                        "item_default": ""
+                      },
+                      {
+                        "item_name": "hostname",
+                        "item_type": "string",
+                        "item_optional": false,
+                        "item_default": ""
+                      },
+                      {
+                        "item_name": "ip-addresses",
+                        "item_type": "list",
+                        "item_optional": false,
+                        "item_default": [],
+                        "list_item_spec":
+                        {
+                            "item_name": "ip-address-reservation",
+                            "item_type": "string",
+                            "item_optional": false,
+                            "item_default": ""
+                        }
+                      },
+                      {
+                        "item_name": "prefixes",
+                        "item_type": "list",
+                        "item_optional": false,
+                        "item_default": [],
+                        "list_item_spec":
+                        {
+                            "item_name": "prefix-reservation",
+                            "item_type": "string",
+                            "item_optional": false,
+                            "item_default": ""
+                        }
+                      } ]
+                  }
                 } ]
             }
       },