diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-11-22 00:08:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-22 00:08:43 +0000 |
| commit | d1750790419d9db3e4d71974005190752c7928e0 (patch) | |
| tree | 9f6521de731c1617d7a66062836dd20a1cf5a6e0 /interface-definitions | |
| parent | 916adfaf0774df0731522bf3cbd886d794735c50 (diff) | |
| parent | 30bbf2278f2b30d4cb67331292c27d09f9a81bf0 (diff) | |
| download | vyos-1x-d1750790419d9db3e4d71974005190752c7928e0.tar.gz vyos-1x-d1750790419d9db3e4d71974005190752c7928e0.zip | |
Merge pull request #2510 from vyos/mergify/bp/sagitta/pr-2506
dhcp-client: T5760: add CLI option to pass user-class parameter (backport #2506)
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/constraint/dhcp-client-string-option.xml.i | 4 | ||||
| -rw-r--r-- | interface-definitions/include/interface/dhcp-options.xml.i | 26 |
2 files changed, 30 insertions, 0 deletions
diff --git a/interface-definitions/include/constraint/dhcp-client-string-option.xml.i b/interface-definitions/include/constraint/dhcp-client-string-option.xml.i new file mode 100644 index 000000000..76e0e5466 --- /dev/null +++ b/interface-definitions/include/constraint/dhcp-client-string-option.xml.i @@ -0,0 +1,4 @@ +<!-- include start from include/constraint/dhcp-client-string-option.xml.i --> +<regex>[-_a-zA-Z0-9\s]+</regex> +<regex>([a-fA-F0-9][a-fA-F0-9]:){2,}[a-fA-F0-9][a-fA-F0-9]</regex> +<!-- include end --> diff --git a/interface-definitions/include/interface/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i index 8027769ff..733512a98 100644 --- a/interface-definitions/include/interface/dhcp-options.xml.i +++ b/interface-definitions/include/interface/dhcp-options.xml.i @@ -7,6 +7,13 @@ <leafNode name="client-id"> <properties> <help>Identifier used by client to identify itself to the DHCP server</help> + <valueHelp> + <format>txt</format> + <description>DHCP option string</description> + </valueHelp> + <constraint> + #include <include/constraint/dhcp-client-string-option.xml.i> + </constraint> </properties> </leafNode> <leafNode name="host-name"> @@ -27,6 +34,25 @@ <leafNode name="vendor-class-id"> <properties> <help>Identify the vendor client type to the DHCP server</help> + <valueHelp> + <format>txt</format> + <description>DHCP option string</description> + </valueHelp> + <constraint> + #include <include/constraint/dhcp-client-string-option.xml.i> + </constraint> + </properties> + </leafNode> + <leafNode name="user-class"> + <properties> + <help>Identify to the DHCP server, user configurable option</help> + <valueHelp> + <format>txt</format> + <description>DHCP option string</description> + </valueHelp> + <constraint> + #include <include/constraint/dhcp-client-string-option.xml.i> + </constraint> </properties> </leafNode> #include <include/interface/no-default-route.xml.i> |