diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-10 15:15:53 +0200 | 
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-05-10 15:18:08 +0200 | 
| commit | d8ddd7191d3004e886fa45a2cf9bd8dd5e7f5e14 (patch) | |
| tree | f2288362d3b4ef9bba115ba938e89cc2f952346a /python | |
| parent | 234f35d8bae71b5d33ad97cdabc236ec6b13c3a2 (diff) | |
| download | vyos-1x-d8ddd7191d3004e886fa45a2cf9bd8dd5e7f5e14.tar.gz vyos-1x-d8ddd7191d3004e886fa45a2cf9bd8dd5e7f5e14.zip | |
bond: T6303: system-mac is not allowed to be a multicast MAC address
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/ifconfig/bond.py | 2 | ||||
| -rw-r--r-- | python/vyos/utils/assertion.py | 4 | 
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): | 
