[fix:openwrt] Auto-generate logical name for VLAN 802.1X interface #335

If the "network" field in the NetJSON is empty, then auto-generate
logical name for the interface.

Fixes #335

Author: pandafy

netjsonconfig/backends/openwrt/converters/interfaces.py

@@ -232,8 +232,8 @@ def _intermediate_vxlan(self, interface):
 
     def _intermediate_8021_vlan(self, interface):
         interface['name'] = '{}.{}'.format(interface['ifname'], interface['vid'])
-        interface['.name'] = interface.get(
-            'network', 'vlan_{}_{}'.format(interface['.name'], interface['vid'])
+        interface['.name'] = interface.get('network') or 'vlan_{}_{}'.format(
+            interface['.name'], interface['vid']
         )
         return interface
 

tests/openwrt/test_interfaces_dsa.py

@@ -2029,6 +2029,13 @@ def test_parse_vlan8021q(self):
         expected['interfaces'][0]['network'] = 'vlan_br_lan_1'
         self.assertEqual(expected, o.config)
 
+    def test_render_vlan8021q_empty_network(self):
+        netjson = deepcopy(self._vlan8021q_netjson)
+        netjson['interfaces'][0]['network'] = ''
+        o = OpenWrt(netjson)
+        expected = self._tabs(self._vlan8021q_uci)
+        self.assertEqual(o.render(), expected)
+
     _vlan8021ad_netjson = {
         "interfaces": [
             {"type": "8021ad", "vid": 6, "name": "eth0", "network": "iot_vlan"}