[raspbian] Improved interfaces jinja2 template

Author: Ritwick DSouza

netjsonconfig/backends/raspbian/converters/interfaces.py

@@ -18,7 +18,7 @@ def to_intermediate(self):
                 'ifname': ifname,
                 'iftype': iftype
             })
-            if iftype in ['ethernet', 'bridge', 'loopback']:
+            if iftype in ['ethernet', 'bridge', 'loopback', 'wireless']:
                 addresses = self._get_address(interface)
                 new_interface.update({
                     'address': addresses

netjsonconfig/backends/raspbian/templates/interfaces.jinja2

@@ -1,23 +1,11 @@
 {% for i, j in data.items() %}
     {% if i|string() == 'interfaces' %}
         {% for interface in j %}
-            {% if interface.get('iftype') == 'wireless' %}
-                {% if interface.get('mode') == 'adhoc' %}
-                    # config: /etc/network/interfaces
-
-                    auto {{ interface.get('iftype') }}
-                    iface {{ interface.get('iftype') }} inet static
-                    address 172.128.1.1
-                        netmask 255.255.255.0
-                        wireless-channel 1
-                        wireless-essid {{ interface.get('essid') }}
-                        wireless-mode ad-hoc
-                {% endif %}
-            {% elif interface.get('iftype') in ['ethernet', 'bridge', 'loopback'] %}
+            {% if interface.get('iftype') in ['ethernet', 'bridge', 'loopback', 'wireless'] %}
+                {% if interface.get('address') != None %}
                 # config: /etc/network/interfaces
-                
+
                 auto {{ interface.get('ifname') }}
-                {% if interface.get('address') != None %}
                     {% for address in interface.get('address') %}
                         {% if address.get('proto') == 'static' %}
                             {% if address.get('family') == 'ipv4' %}
@@ -75,8 +63,22 @@
                     {% endfor %}
                 {% else %}
                     {% if interface.get('iftype') == 'bridge' %}
+                    # config: /etc/network/interfaces
+
+                    auto {{ interface.get('ifname') }}
                     bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
                     {% endif %}
+                    {% if interface.get('mode') == 'adhoc' %}
+                        # config: /etc/network/interfaces
+
+                        auto {{ interface.get('iftype') }}
+                        iface {{ interface.get('iftype') }} inet static
+                        address 172.128.1.1
+                            netmask 255.255.255.0
+                            wireless-channel 1
+                            wireless-essid {{ interface.get('essid') }}
+                            wireless-mode ad-hoc
+                    {% endif %}
                 {% endif %}
             {% endif %}