summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-05-10 15:15:53 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-05-10 13:21:59 +0000
commit82552e2abc77640b3a81560e3f8c5be2c21e3ad2 (patch)
tree9ef8b4136f90ea65cc4b50846798e28b6b028114 /python
parent05099eab245c265474f10ffb206ab23c494c8b88 (diff)
downloadvyos-1x-82552e2abc77640b3a81560e3f8c5be2c21e3ad2.tar.gz
vyos-1x-82552e2abc77640b3a81560e3f8c5be2c21e3ad2.zip
bond: T6303: system-mac is not allowed to be a multicast MAC address
(cherry picked from commit d8ddd7191d3004e886fa45a2cf9bd8dd5e7f5e14)
Diffstat (limited to 'python')
-rw-r--r--python/vyos/ifconfig/bond.py2
-rw-r--r--python/vyos/utils/assertion.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/python/vyos/ifconfig/bond.py b/python/vyos/ifconfig/bond.py
index b381ba0e1..f26426915 100644
--- a/python/vyos/ifconfig/bond.py
+++ b/python/vyos/ifconfig/bond.py
@@ -56,7 +56,7 @@ class BondIf(Interface):
'location': '/sys/class/net/{ifname}/bonding/lacp_rate',
},
'bond_system_mac': {
- 'validate': assert_mac,
+ 'validate': lambda v: assert_mac(v, test_all_zero=False),
'location': '/sys/class/net/{ifname}/bonding/ad_actor_system',
},
'bond_miimon': {
diff --git a/python/vyos/utils/assertion.py b/python/vyos/utils/assertion.py
index 1aaa54dff..c7fa220c3 100644
--- a/python/vyos/utils/assertion.py
+++ b/python/vyos/utils/assertion.py
@@ -53,7 +53,7 @@ def assert_mtu(mtu, ifname):
if (max_mtu and cur_mtu > max_mtu) or cur_mtu > 65536:
raise ValueError(f'MTU is too small for interface "{ifname}": {mtu} > {max_mtu}')
-def assert_mac(m):
+def assert_mac(m, test_all_zero=True):
split = m.split(':')
size = len(split)
@@ -74,7 +74,7 @@ def assert_mac(m):
raise ValueError(f'{m} is a multicast MAC address')
# overall mac address is not allowed to be 00:00:00:00:00:00
- if sum(octets) == 0:
+ if test_all_zero and sum(octets) == 0:
raise ValueError('00:00:00:00:00:00 is not a valid MAC address')
if octets[:5] == (0, 0, 94, 0, 1):