network: split qmi out from network data structure

Author: pktpls

locations/pktplsmobil.yml

@@ -65,14 +65,15 @@ networks:
     ifname: wwan0
     role: uplink
     uplink_mode: direct
-    wwan:
-      proto: qmi
-      device: /dev/cdc-wdm0
-      apn: internet
-      pdptype: ipv4
 
   - role: tunnel
     ifname: ts_wg0
     mtu: 1280
     prefix: 10.248.17.226/32
     wireguard_port: 51820
+
+qmi:
+  - name: wwan
+    device: /dev/cdc-wdm0
+    apn: internet
+    pdptype: ipv4

roles/cfg_openwrt/templates/common/config/network.j2

@@ -85,15 +85,6 @@ config interface '{{ name }}'
     {% endif %}
   {% endif %}
 
-  {% if 'wwan' in network %}
-config interface 'wwan'
-    {% set wwan = network['wwan'] %}
-  option proto '{{ wwan['proto'] }}'
-  option device '{{ wwan['device'] }}'
-  option apn '{{ wwan['apn'] }}'
-  option pdptype '{{ wwan['pdptype'] }}'
-  {% endif %}
-
   {% if libnetwork.isPortNeeded(network) | from_json and libnetwork.isBridgeNeeded(network) | from_json %}
 config device
 	option name '{{ libnetwork.getBridgeIfname(network) }}'
@@ -111,3 +102,13 @@ config device '{{ i }}_dev'
 	option macaddr '{{ mac_override[i] }}'
 
 {% endfor %}
+{% if qmi is defined %}
+  {% for q in qmi %}
+config interface '{{ q['name'] }}'
+  option proto 'qmi'
+  option device '{{ q['device'] }}'
+  option apn '{{ q['apn'] }}'
+  option pdptype '{{ q['pdptype'] }}'
+
+  {% endfor %}
+{% endif %}