diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-10-19 20:19:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-19 20:19:03 +0200 |
| commit | 999c99a19bd72c4c6220530752bcffed8bd4cbad (patch) | |
| tree | 17d1a680b06c048d477da32bccc4da537d07c7da | |
| parent | 7f17e09fde178f42503c3403e391f630223bce35 (diff) | |
| parent | a551d6e9f5fea5090bb0ff52e5721103ef990fb9 (diff) | |
| download | vyos-1x-999c99a19bd72c4c6220530752bcffed8bd4cbad.tar.gz vyos-1x-999c99a19bd72c4c6220530752bcffed8bd4cbad.zip | |
Merge pull request #2383 from vyos/mergify/bp/sagitta/pr-2378
bridge: T5670: add missing constraint on "member interface" node (backport #2378)
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 3 | ||||
| -rw-r--r-- | python/vyos/configdict.py | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index fcfb8686c..db3762065 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -123,6 +123,9 @@ <completionHelp> <script>${vyos_completion_dir}/list_interfaces --bridgeable</script> </completionHelp> + <constraint> + #include <include/constraint/interface-name.xml.i> + </constraint> </properties> <children> <leafNode name="native-vlan"> diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index 71a06b625..075ffe466 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -258,10 +258,10 @@ def has_address_configured(conf, intf): old_level = conf.get_level() conf.set_level([]) - intfpath = 'interfaces ' + Section.get_config_path(intf) - if ( conf.exists(f'{intfpath} address') or - conf.exists(f'{intfpath} ipv6 address autoconf') or - conf.exists(f'{intfpath} ipv6 address eui64') ): + intfpath = ['interfaces', Section.get_config_path(intf)] + if (conf.exists([intfpath, 'address']) or + conf.exists([intfpath, 'ipv6', 'address', 'autoconf']) or + conf.exists([intfpath, 'ipv6', 'address', 'eui64'])): ret = True conf.set_level(old_level) @@ -279,8 +279,7 @@ def has_vrf_configured(conf, intf): old_level = conf.get_level() conf.set_level([]) - tmp = ['interfaces', Section.get_config_path(intf), 'vrf'] - if conf.exists(tmp): + if conf.exists(['interfaces', Section.get_config_path(intf), 'vrf']): ret = True conf.set_level(old_level) @@ -298,8 +297,7 @@ def has_vlan_subinterface_configured(conf, intf): ret = False intfpath = ['interfaces', Section.section(intf), intf] - if ( conf.exists(intfpath + ['vif']) or - conf.exists(intfpath + ['vif-s'])): + if (conf.exists(intfpath + ['vif']) or conf.exists(intfpath + ['vif-s'])): ret = True return ret |