diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-21 09:06:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-21 09:06:56 +0100 |
| commit | c85c3a786e05209011dbc143b25d01baa2d593f9 (patch) | |
| tree | 443a3f074936409860c2116342894afe53669530 /interface-definitions | |
| parent | 79879e797cef81ff96ee535da90b8c0d2350594e (diff) | |
| parent | 9fabf1799e216a72473c833082c6d8c1d7bd5549 (diff) | |
| download | vyos-1x-c85c3a786e05209011dbc143b25d01baa2d593f9.tar.gz vyos-1x-c85c3a786e05209011dbc143b25d01baa2d593f9.zip | |
Merge pull request #2666 from vyos/mergify/bp/sagitta/pr-2664
dhcp: T5846: Refactor and simplify DUID definition (backport #2664)
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/interface/dhcpv6-options.xml.i | 13 | ||||
| -rw-r--r-- | interface-definitions/include/interface/duid.xml.i | 15 |
2 files changed, 16 insertions, 12 deletions
diff --git a/interface-definitions/include/interface/dhcpv6-options.xml.i b/interface-definitions/include/interface/dhcpv6-options.xml.i index 5ca1d525f..68d1b172f 100644 --- a/interface-definitions/include/interface/dhcpv6-options.xml.i +++ b/interface-definitions/include/interface/dhcpv6-options.xml.i @@ -4,18 +4,7 @@ <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>duid</format> - <description>DHCP unique identifier (DUID)</description> - </valueHelp> - <constraint> - <validator name="ipv6-duid"/> - </constraint> - </properties> - </leafNode> + #include <include/interface/duid.xml.i> <leafNode name="parameters-only"> <properties> <help>Acquire only config parameters, no address</help> diff --git a/interface-definitions/include/interface/duid.xml.i b/interface-definitions/include/interface/duid.xml.i new file mode 100644 index 000000000..4f8988dfa --- /dev/null +++ b/interface-definitions/include/interface/duid.xml.i @@ -0,0 +1,15 @@ +<!-- include start from interface/duid.xml.i --> +<leafNode name="duid"> + <properties> + <help>DHCP unique identifier (DUID) to be sent by client</help> + <valueHelp> + <format>duid</format> + <description>DHCP unique identifier</description> + </valueHelp> + <constraint> + <regex>([0-9A-Fa-f]{2}:){,127}([0-9A-Fa-f]{2})</regex> + </constraint> + <constraintErrorMessage>Invalid DUID, must be in the format h[[:h]...]</constraintErrorMessage> + </properties> +</leafNode> +<!-- include end --> |