addons: dhcp: Policy to specify DUID type to use on dhcpv6 requests

Update module description and changelog

Signed-off-by: Rajendra Dendukuri <rajendra.dendukuri@broadcom.com>

diff --git a/debian/changelog b/debian/changelog
index 2247f14b1cde255105f935cf916f6d4731323fba..47b02757403a955d2d671fca76e9d65924817dd7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ifupdown2 (1.2.6-1) unstable; urgency=medium
   * New: link-down yes will also down macvlans
   * New: XFRM addon module
   * New: Add policy to wait for IPv6 link local address to be available
+  * New: Add policy dhcp6-duid to specify DUID type to be used for IPv6 interfaces
 
  -- Julien Fortin <julien@cumulusnetworks.com>  Sun, 23 Jun 2019 23:42:42 -1000
 

diff --git a/ifupdown2/addons/dhcp.py b/ifupdown2/addons/dhcp.py
index ca4198842196eb5a5d8d29655fc8d6e99b5f5af3..67a66eacb691309f0a2d2f724ac209bf97012bda 100644 (file)
--- a/ifupdown2/addons/dhcp.py
+++ b/ifupdown2/addons/dhcp.py
@@ -32,6 +32,35 @@ except ImportError:
 class dhcp(moduleBase):
     """ ifupdown2 addon module to configure dhcp on interface """
 
+    _modinfo = {
+        "mhelp": "Configure dhcp",
+        "attrs": {
+            "dhcp6-duid": {
+                "help": "Override the default when selecting the type of DUID to use. By default, DHCPv6 dhclient "
+                        "creates an identifier based on the link-layer address (DUID-LL) if it is running in stateless "
+                        "mode (with -S, not requesting an address), or it creates an identifier based on the "
+                       "link-layer address plus a timestamp (DUID-LLT) if it is running in stateful mode (without -S, "
+                        "requesting an  address). When DHCPv4 is configured to use a DUID using -i option the default "
+                        "is to use a DUID-LLT. -D overrides these default, with a value of either LL or LLT.",
+               "validvals": ["LL", "LLT"],
+                "example": ["dhcp6-duid LL"]
+            },
+           "dhcp-wait": {
+                "help": "Wait or not wait and become a daemon immediately (nowait) rather than waiting until an "
+                         "IP address has been acquired. If not specified default value is true, that is to wait.",
+               "validvals": ["true", "false"],
+                "example": ["dhcp-wait false"]
+            },
+           "dhcp6-ll-wait": {
+                "help": "Overrides the default wait time before DHCPv6 client is started. During this wait time, "
+                        "ifupdown2 checks if the interface requesting an address has a valid link-local address. "
+                        "If not specified default value used is 10 seconds.",
+               "validvals": ["whole numbers"],
+                "example": ["dhcp6-ll-wait 0"]
+           }
+        }
+    }
+
     def __init__(self, *args, **kargs):
         moduleBase.__init__(self, *args, **kargs)
         self.dhclientcmd = dhclient(**kargs)