From d770f1d53bb5960a3c408229413de0452daa286f Mon Sep 17 00:00:00 2001 From: slaffer Date: Sat, 23 Apr 2016 20:19:48 -0700 Subject: [PATCH] addons: vlan: remove reserved VLAN check for builtin interfaces Ticket: CM-10387 Reviewed By: roopa, wkok Testing Done: slaffer addons/vlan.py checks if a builtin interface's VLAN ID is within the switchd reserved VLAN range. This stops a user configuring any port- local VLANs within that range, despite it being a valid configuration in both a hardware and kernel sense. This commit removes the check for builtin interfaces only. The check of the bridge-vids list for a vlan-aware bridge still resides and correctly operates in addons/bridge.py. --- addons/vlan.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/vlan.py b/addons/vlan.py index 85e7b75..866be26 100644 --- a/addons/vlan.py +++ b/addons/vlan.py @@ -128,8 +128,6 @@ class vlan(moduleBase): vlanid = self._get_vlan_id(ifaceobj) if vlanid == -1: raise Exception('could not determine vlanid') - if self._handle_reserved_vlan(vlanid, ifaceobj.name): - return vlanrawdevice = self._get_vlan_raw_device(ifaceobj) if not vlanrawdevice: raise Exception('could not determine vlan raw device')