summaryrefslogtreecommitdiff
path: root/interface-definitions/include
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-20 12:46:36 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-20 12:46:36 +0100
commit509fed31c63d52b5ffb73e58a2da75add699ede2 (patch)
tree6baed459322c8793976e55ec67e4043643bbda8b /interface-definitions/include
parent0cf4694a23b20e7f15fb8b8b349c16dfc3e17ade (diff)
parent9541355433e202fade4692851bffa33ba9d48f44 (diff)
downloadvyos-1x-509fed31c63d52b5ffb73e58a2da75add699ede2.tar.gz
vyos-1x-509fed31c63d52b5ffb73e58a2da75add699ede2.zip
Merge branch 'duid' into current
* duid: dhcpv6: T3134: add missing duid support
Diffstat (limited to 'interface-definitions/include')
-rw-r--r--interface-definitions/include/dhcpv6-options.xml.i12
-rw-r--r--interface-definitions/include/interface-mac.xml.i2
2 files changed, 13 insertions, 1 deletions
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index 9a1016956..997d4f2a4 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -4,6 +4,18 @@
<help>DHCPv6 client settings/options</help>
</properties>
<children>
+ <leafNode name="duid">
+ <properties>
+ <help>DHCP unique identifier (DUID) to be sent by dhcpv6 client</help>
+ <valueHelp>
+ <format>&lt;h:h:h:h:h:h:h:h:h:h:h:h:h:h:h:h&gt;</format>
+ <description>DHCP unique identifier (DUID)</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ipv6-duid"/>
+ </constraint>
+ </properties>
+ </leafNode>
<leafNode name="parameters-only">
<properties>
<help>Acquire only config parameters, no address</help>
diff --git a/interface-definitions/include/interface-mac.xml.i b/interface-definitions/include/interface-mac.xml.i
index e277de85c..87dc5fb60 100644
--- a/interface-definitions/include/interface-mac.xml.i
+++ b/interface-definitions/include/interface-mac.xml.i
@@ -3,7 +3,7 @@
<properties>
<help>Media Access Control (MAC) address</help>
<valueHelp>
- <format>h:h:h:h:h:h</format>
+ <format>macaddr</format>
<description>Hardware (MAC) address</description>
</valueHelp>
<constraint>