[raspbian] Added support for generating tar.gz file

Author: Ritwick DSouza

netjsonconfig/backends/raspbian/raspbian.py

@@ -1,3 +1,4 @@
+import re
 from . import converters
 from ..base.backend import BaseBackend
 from .renderer import Commands, Hostapd, Hostname, Interfaces, Ntp, Resolv
@@ -25,3 +26,17 @@ class Raspbian(BaseBackend):
         Ntp,
         Commands
     ]
+
+    def _generate_contents(self, tar):
+        text = self.render(files=False)
+        config_files_pattern = re.compile('^# config:\s', flags=re.MULTILINE)
+        config_files = config_files_pattern.split(text)
+        if '' in config_files:
+            config_files.remove('')
+        for config_file in config_files:
+            lines = config_file.split('\n')
+            file_name = lines[0]
+            text_contents = '\n'.join(lines[2:])
+            self._add_file(tar=tar,
+                           name='{0}'.format(file_name),
+                           contents=text_contents)

netjsonconfig/backends/raspbian/templates/hostapd.jinja2

@@ -2,6 +2,7 @@
     {% if i|string() == 'wireless' %}
         {% for wireless in j %}
             # config: /etc/hostapd/hostapd.conf
+            
             interface={{ wireless.get('ifname') }}
             driver=nl80211
             {% if wireless.get('protocol') == 'a' or 'b' or 'g' %}

netjsonconfig/backends/raspbian/templates/hostname.jinja2

@@ -3,6 +3,7 @@
         {% for general in j %}
             {% if general.get('hostname') %}
                 # config: /etc/hostname
+                
                 {{ general.get('hostname') }}
 
             {% endif %}

netjsonconfig/backends/raspbian/templates/interfaces.jinja2

@@ -4,6 +4,7 @@
             {% 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
@@ -14,6 +15,7 @@
                 {% endif %}
             {% elif interface.get('iftype') in ['ethernet', 'bridge', 'loopback'] %}
                 # config: /etc/network/interfaces
+                
                 auto {{ interface.get('ifname') }}
                 {% if interface.get('address') != None %}
                     {% for address in interface.get('address') %}

netjsonconfig/backends/raspbian/templates/ntp.jinja2

@@ -1,6 +1,7 @@
 {% for i, j in data.items() %}
     {% if i|string() == 'ntp' %}
         # config: /etc/ntp.conf
+        
         {% for server in j %}
             server {{ server }}
         {% endfor %}

netjsonconfig/backends/raspbian/templates/resolv.jinja2

@@ -3,6 +3,7 @@
         {% if i|string() in ['dns_servers', 'dns_search'] %}
             {% if count == [1] %}
                 # config: /etc/resolv.conf
+                
                 {% if count.append(count.pop() + 1) %}{% endif %}
             {% endif %}
         {% endif %}

tests/raspbian/test_hostapd.py

@@ -38,6 +38,7 @@ def test_wpa2_personal(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=g
@@ -85,6 +86,7 @@ def test_wpa_personal(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=g
@@ -200,6 +202,7 @@ def test_encryption_disabled(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=g
@@ -238,6 +241,7 @@ def test_no_encryption(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=g

tests/raspbian/test_interfaces.py

@@ -25,6 +25,7 @@ def test_ipv4_static(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth0
 iface eth0 inet static
 address 10.0.0.1
@@ -52,6 +53,7 @@ def test_ipv6_static(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth0
 iface eth0 inet6 static
 address fe80::ba27:ebff:fe1c:5477
@@ -85,6 +87,7 @@ def test_multiple_static(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth0
 iface eth0 inet static
 address 10.0.0.1
@@ -113,6 +116,7 @@ def test_ipv4_dhcp(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth0
 iface eth0 inet dhcp
 
@@ -136,6 +140,7 @@ def test_ipv6_dhcp(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth0
 iface eth0 inet6 dhcp
 
@@ -164,6 +169,7 @@ def test_multiple_dhcp(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth0
 iface eth0 inet dhcp
 iface eth0 inet6 dhcp
@@ -203,6 +209,7 @@ def test_multiple_ip(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth0.1
 iface eth0.1 inet static
 address 192.168.1.1
@@ -235,6 +242,7 @@ def test_mtu(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth1
 iface eth1 inet dhcp
 pre-up /sbin/ifconfig $IFACE mtu 1500
@@ -260,6 +268,7 @@ def test_mac(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth1
 iface eth1 inet dhcp
 hwaddress 52:54:00:56:46:c0
@@ -297,6 +306,7 @@ def test_multiple_ip_and_dhcp(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth0
 iface eth0 inet dhcp
 iface eth0 inet static
@@ -330,12 +340,14 @@ def test_interface_with_resolv(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto eth0
 iface eth0 inet static
 address 192.168.1.1
 netmask 255.255.255.0
 
 # config: /etc/resolv.conf
+
 nameserver 10.11.12.13
 nameserver 8.8.8.8
 search netjson.org
@@ -362,6 +374,7 @@ def test_loopback(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto lo
 iface lo inet static
 address 127.0.0.1
@@ -387,6 +400,7 @@ def test_adhoc_wireless(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto wireless
 iface wireless inet static
 address 172.128.1.1
@@ -414,6 +428,7 @@ def test_simple_bridge(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto br-lan
 bridge_ports eth0 eth1
 
@@ -444,6 +459,7 @@ def test_complex_bridge(self):
         })
 
         expected = '''# config: /etc/network/interfaces
+
 auto brwifi
 iface brwifi inet6 static
 address fe80::8029:23ff:fe7d:c214

tests/raspbian/test_radios.py

@@ -44,6 +44,7 @@ def test_radio_multi(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=g
@@ -81,6 +82,7 @@ def test_radio_n_24ghz(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=g
@@ -118,6 +120,7 @@ def test_radio_n_5ghz(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=a
@@ -154,6 +157,7 @@ def test_radio_ac(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=a
@@ -190,6 +194,7 @@ def test_radio_a(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=a
@@ -225,6 +230,7 @@ def test_radio_g(self):
         })
 
         expected = '''# config: /etc/hostapd/hostapd.conf
+
 interface=wlan0
 driver=nl80211
 hw_mode=g

tests/raspbian/test_resolv.py

@@ -15,6 +15,7 @@ def test_dns_server(self):
         })
 
         expected = '''# config: /etc/resolv.conf
+
 nameserver 10.254.0.1
 nameserver 10.254.0.2
 '''
@@ -28,6 +29,7 @@ def test_dns_search(self):
         })
 
         expected = '''# config: /etc/resolv.conf
+
 search domain.com
 '''
         self.assertEqual(o.render(), expected)
@@ -44,6 +46,7 @@ def test_dns_server_and_dns_search(self):
         })
 
         expected = '''# config: /etc/resolv.conf
+
 nameserver 10.11.12.13
 nameserver 8.8.8.8
 search netjson.org