diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-01-22 18:53:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 18:53:08 +0100 |
| commit | e090c10ea0767bf144f64966d6d0f52fd28b5837 (patch) | |
| tree | 37ca30e7ecf4f65ac0cea62e911cab072bc0caae /interface-definitions/include | |
| parent | e6670b7277147ddf3fa72a9522069fef7d9430f4 (diff) | |
| parent | ddd2a3e01b2f92952d035a5a5454c233be92ef3f (diff) | |
| download | vyos-1x-e090c10ea0767bf144f64966d6d0f52fd28b5837.tar.gz vyos-1x-e090c10ea0767bf144f64966d6d0f52fd28b5837.zip | |
Merge pull request #1774 from c-po/t4875-backport
validators: T4875: use file-path to replace validator 'interface-name' (backport)
Diffstat (limited to 'interface-definitions/include')
4 files changed, 7 insertions, 3 deletions
diff --git a/interface-definitions/include/constraint/interface-name.xml.in b/interface-definitions/include/constraint/interface-name.xml.in new file mode 100644 index 000000000..2d1f7b757 --- /dev/null +++ b/interface-definitions/include/constraint/interface-name.xml.in @@ -0,0 +1,4 @@ +<!-- include start from constraint/interface-name.xml.in --> +<regex>(bond|br|dum|en|ersp|eth|gnv|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|tun|veth|vti|vtun|vxlan|wg|wlan|wwan)[0-9]+(.\d+)?|lo</regex> +<validator name="file-path --lookup-path /sys/class/net --directory"/> +<!-- include end --> diff --git a/interface-definitions/include/generic-interface-broadcast.xml.i b/interface-definitions/include/generic-interface-broadcast.xml.i index 6f76dde1a..af35a888b 100644 --- a/interface-definitions/include/generic-interface-broadcast.xml.i +++ b/interface-definitions/include/generic-interface-broadcast.xml.i @@ -10,7 +10,7 @@ <description>Interface name</description> </valueHelp> <constraint> - <validator name="interface-name"/> + #include <include/constraint/interface-name.xml.in> </constraint> </properties> </leafNode> diff --git a/interface-definitions/include/generic-interface-multi.xml.i b/interface-definitions/include/generic-interface-multi.xml.i index 65aae28ae..16916ff54 100644 --- a/interface-definitions/include/generic-interface-multi.xml.i +++ b/interface-definitions/include/generic-interface-multi.xml.i @@ -10,7 +10,7 @@ <description>Interface name</description> </valueHelp> <constraint> - <validator name="interface-name"/> + #include <include/constraint/interface-name.xml.in> </constraint> <multi/> </properties> diff --git a/interface-definitions/include/source-interface.xml.i b/interface-definitions/include/source-interface.xml.i index a9c2a0f9d..4c1fddb57 100644 --- a/interface-definitions/include/source-interface.xml.i +++ b/interface-definitions/include/source-interface.xml.i @@ -10,7 +10,7 @@ <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> <constraint> - <validator name="interface-name"/> + #include <include/constraint/interface-name.xml.in> </constraint> </properties> </leafNode> |