mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

Merge pull request #258 from aderumier/vlanprotocol-query-check

Browse Source 
vlan: query_check: check vlan-protocol for not dotted interface
This commit is contained in:
Julien Fortin
2023-04-20 14:01:39 +02:00
committed by GitHub
parent 5876ad8a0e 3fee068a67
commit 080fc71a2f
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ifupdown2/addons/vlan.py
View File

@ -224,10 +224,13 @@ class vlan(Addon, moduleBase):
def _query_check(self, ifaceobj, ifaceobjcurr): def _query_check(self, ifaceobj, ifaceobjcurr):
if not self.cache.link_exists(ifaceobj.name): if not self.cache.link_exists(ifaceobj.name):
return return
ifname = ifaceobj.name
cached_vlan_info_data = self.cache.get_link_info_data(ifname)
if '.' not in ifaceobj.name: if '.' not in ifaceobj.name:
# if vlan name is not in the dot format, check its running state # if vlan name is not in the dot format, check its running state
ifname = ifaceobj.name
cached_vlan_raw_device = self.cache.get_lower_device_ifname(ifname) cached_vlan_raw_device = self.cache.get_lower_device_ifname(ifname)
# #
@ -239,8 +242,6 @@ class vlan(Addon, moduleBase):
cached_vlan_raw_device != ifaceobj.get_attr_value_first('vlan-raw-device') cached_vlan_raw_device != ifaceobj.get_attr_value_first('vlan-raw-device')
) )
cached_vlan_info_data = self.cache.get_link_info_data(ifname)
# #
# vlan-id # vlan-id
# #
@ -253,7 +254,7 @@ class vlan(Addon, moduleBase):
ifaceobjcurr.update_config_with_status('vlan-id', cached_vlan_id_str, vlanid_config != cached_vlan_id_str) ifaceobjcurr.update_config_with_status('vlan-id', cached_vlan_id_str, vlanid_config != cached_vlan_id_str)
# #
# vlan-protocol # vlan-protocol (dot or not dot format)
# #
protocol_config = ifaceobj.get_attr_value_first('vlan-protocol') protocol_config = ifaceobj.get_attr_value_first('vlan-protocol')
if protocol_config: if protocol_config:
@ -273,6 +274,7 @@ class vlan(Addon, moduleBase):
0 0
) )
if '.' not in ifaceobj.name:
# #
# vlan-bridge-binding # vlan-bridge-binding
# #