From 117d7654af60560a6d0c1dc60d1fd654c86473a7 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Tue, 21 Jun 2016 15:17:09 +0100 Subject: [PATCH] addons: vlan: ifquery will try to get the vlan-id from the ifacename if vlan-id attr is missing Ticket: CM-11485 Reviewed By: Roopa Testing Done: config from the github issue First reported here https://github.com/CumulusNetworks/ifupdown2/issues/10 ifquery just like ifupdown should try to get the vlan-id from the iface name if vlan-id attr is not specified. Signed-off-by: Julien Fortin --- addons/vlan.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/vlan.py b/addons/vlan.py index ec2e2e5..ea4e68e 100644 --- a/addons/vlan.py +++ b/addons/vlan.py @@ -176,11 +176,13 @@ class vlan(moduleBase): else: ifaceobjcurr.update_config_with_status('vlan-raw-device', vlanrawdev, 0) - if vlanid != ifaceobj.get_attr_value_first('vlan-id'): + vlanid_config = ifaceobj.get_attr_value_first('vlan-id') + if not vlanid_config: + vlanid_config = str(self._get_vlan_id(ifaceobj)) + if vlanid != vlanid_config: ifaceobjcurr.update_config_with_status('vlan-id', vlanid, 1) else: - ifaceobjcurr.update_config_with_status('vlan-id', - vlanid, 0) + ifaceobjcurr.update_config_with_status('vlan-id', vlanid, 0) self._bridge_vid_check(ifaceobj, ifaceobjcurr, vlanrawdev, vlanid) def _query_running(self, ifaceobjrunning):