[openwrt] Added "vid" option in "switch" #85

- automatically infer "vid" attribute from "vlan"
- allow manual override of "vid"
- allow disabling override by supplying an empty value

Fixes #85

Author: nemesifier

docs/source/backends/openwrt.rst

@@ -1576,6 +1576,62 @@ Will be rendered as follows::
     config switch_vlan 'switch0_vlan1'
             option device 'switch0'
             option ports '0t 2 3 4 5'
+            option vid '1'
+            option vlan '1'
+
+    config switch_vlan 'switch0_vlan2'
+            option device 'switch0'
+            option ports '0t 1'
+            option vid '2'
+            option vlan '2'
+
+Overriding or disabling ``vid`` UCI option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The OpenWRT/LEDE UCI ``vid`` option of ``switch_vlan`` sections is automatically inferred
+from the ``vlan`` number, although it's possible to override it or disable it if needed:
+
+.. code-block:: python
+
+    {
+        "switch": [
+            {
+                "name": "switch0",
+                "reset": True,
+                "enable_vlan": True,
+                "vlan": [
+                    {
+                        "device": "switch0",
+                        "vlan": 1,
+                        "vid": 110,  # manual override
+                        "ports": "0t 2 3 4 5"
+                    },
+                    {
+                        "device": "switch0",
+                        "vlan": 2,
+                        # ``None`` or empty string will remove
+                        # ``vid`` output from the UCI result
+                        "vid": None,
+                        "ports": "0t 1"
+                    }
+                ]
+            }
+        ]
+    }
+
+Will be rendered as follows::
+
+    package network
+
+    config switch 'switch0'
+            option enable_vlan '1'
+            option name 'switch0'
+            option reset '1'
+
+    config switch_vlan 'switch0_vlan1'
+            option device 'switch0'
+            option ports '0t 2 3 4 5'
+            option vid '110'
             option vlan '1'
 
     config switch_vlan 'switch0_vlan2'

netjsonconfig/backends/openwrt/converters.py

@@ -326,6 +326,8 @@ def to_intermediate(self):
                     '.type': 'switch_vlan',
                     '.name': '{0}_vlan{1}'.format(switch['name'], i)
                 })
+                if 'vid' not in vlan:
+                    vlan['vid'] = vlan['vlan']
                 vlans.append(sorted_dict(vlan))
                 i += 1
             del switch['vlan']

tests/openwrt/test_network.py

@@ -750,6 +750,7 @@ def test_switch(self):
                         {
                             "device": "switch0",
                             "vlan": 2,
+                            "vid": None,  # ``None`` or empty string disable ``vid``
                             "ports": "0t 1"
                         }
                     ]
@@ -762,6 +763,7 @@ def test_switch(self):
                         {
                             "device": "switch1",
                             "vlan": 3,
+                            "vid": 130,
                             "ports": "0t 6 7"
                         }
                     ]
@@ -778,6 +780,7 @@ def test_switch(self):
 config switch_vlan 'switch0_vlan1'
     option device 'switch0'
     option ports '0t 2 3 4 5'
+    option vid '1'
     option vlan '1'
 
 config switch_vlan 'switch0_vlan2'
@@ -793,6 +796,7 @@ def test_switch(self):
 config switch_vlan 'switch1_vlan1'
     option device 'switch1'
     option ports '0t 6 7'
+    option vid '130'
     option vlan '3'
 """)
         self.assertEqual(o.render(), expected)