[raspbian] Changed template format

Author: Ritwick DSouza

netjsonconfig/backends/raspbian/converters/base.py

@@ -2,5 +2,4 @@
 
 
 class RaspbianConverter(BaseConverter):
-    def test_function(self):
-        return 'Nothing'
+    pass

netjsonconfig/backends/raspbian/raspbian.py

@@ -9,7 +9,6 @@ class Raspbian(BaseBackend):
     Raspbian Backend
     """
     schema = schema
-    env_path = 'netjsonconfig.backends.raspbian'
     converters = [
         converters.General,
         converters.Interfaces,

netjsonconfig/backends/raspbian/templates/hostapd.jinja2

@@ -1,7 +1,7 @@
 {% for i, j in data.items() %}
 {% if i|string() == 'wireless' %}
 {% for wireless in j %}
-config: /etc/hostapd/hostapd.conf
+# config: /etc/hostapd/hostapd.conf
 interface={{ wireless.get('ifname') }}
 driver=nl80211
 hw_mode={{ wireless.get('hwmode')}}

netjsonconfig/backends/raspbian/templates/hostname.jinja2

@@ -2,7 +2,7 @@
 {% if i|string() == 'general' %}
 {% for general in j %}
 {% if general.get('hostname') %}
-config: /etc/hostname
+# config: /etc/hostname
 {{ general.get('hostname') }}
 
 {% endif %}

netjsonconfig/backends/raspbian/templates/interfaces.jinja2

@@ -3,7 +3,7 @@
 {% for interface in j %}
 {% if interface.get('iftype') == 'wireless' %}
 {% if interface.get('mode') == 'adhoc' %}
-config: /etc/network/interfaces
+# config: /etc/network/interfaces
 auto {{ interface.get('iftype') }}
 iface {{ interface.get('iftype') }} inet static
     address 172.128.1.1
@@ -13,7 +13,7 @@ iface {{ interface.get('iftype') }} inet static
     wireless-mode ad-hoc
 {% endif %}
 {% elif interface.get('iftype') in ['ethernet', 'bridge', 'loopback'] %}
-config: /etc/network/interfaces
+# 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,6 @@
 {% for i, j in data.items() %}
 {% if i|string() == 'ntp' %}
-config: /etc/ntp.conf
+# config: /etc/ntp.conf
 {% for server in j %}
 server {{ server }}
 {% endfor %}

netjsonconfig/backends/raspbian/templates/resolv.jinja2

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

tests/raspbian/test_hostapd.py

@@ -37,7 +37,7 @@ def test_wpa2_personal(self):
             ]
         })
 
-        expected = '''config: /etc/hostapd/hostapd.conf
+        expected = '''# config: /etc/hostapd/hostapd.conf
 interface=wlan0
 driver=nl80211
 hw_mode=g
@@ -84,7 +84,7 @@ def test_wpa_personal(self):
             ]
         })
 
-        expected = '''config: /etc/hostapd/hostapd.conf
+        expected = '''# config: /etc/hostapd/hostapd.conf
 interface=wlan0
 driver=nl80211
 hw_mode=g
@@ -199,7 +199,7 @@ def test_encryption_disabled(self):
             ]
         })
 
-        expected = '''config: /etc/hostapd/hostapd.conf
+        expected = '''# config: /etc/hostapd/hostapd.conf
 interface=wlan0
 driver=nl80211
 hw_mode=g
@@ -237,7 +237,7 @@ def test_no_encryption(self):
             ]
         })
 
-        expected = '''config: /etc/hostapd/hostapd.conf
+        expected = '''# config: /etc/hostapd/hostapd.conf
 interface=wlan0
 driver=nl80211
 hw_mode=g

tests/raspbian/test_interfaces.py

@@ -24,7 +24,7 @@ def test_ipv4_static(self):
             ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth0
 iface eth0 inet static
     address 10.0.0.1
@@ -51,7 +51,7 @@ def test_ipv6_static(self):
             ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth0
 iface eth0 inet6 static
     address fe80::ba27:ebff:fe1c:5477
@@ -84,7 +84,7 @@ def test_multiple_static(self):
             ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth0
 iface eth0 inet static
     address 10.0.0.1
@@ -112,7 +112,7 @@ def test_ipv4_dhcp(self):
                 ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth0
 iface eth0 inet dhcp
 
@@ -135,7 +135,7 @@ def test_ipv6_dhcp(self):
                 ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth0
 iface eth0 inet6 dhcp
 
@@ -163,7 +163,7 @@ def test_multiple_dhcp(self):
                     ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth0
 iface eth0 inet dhcp
 iface eth0 inet6 dhcp
@@ -202,7 +202,7 @@ def test_multiple_ip(self):
             ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth0.1
 iface eth0.1 inet static
     address 192.168.1.1
@@ -234,7 +234,7 @@ def test_mtu(self):
             ],
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth1
 iface eth1 inet dhcp
     pre-up /sbin/ifconfig $IFACE mtu 1500
@@ -259,7 +259,7 @@ def test_mac(self):
                 ],
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth1
 iface eth1 inet dhcp
     hwaddress 52:54:00:56:46:c0
@@ -296,7 +296,7 @@ def test_multiple_ip_and_dhcp(self):
             ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto eth0
 iface eth0 inet dhcp
 iface eth0 inet static
@@ -329,13 +329,13 @@ def test_interface_with_resolv(self):
             "dns_search": ["netjson.org", "openwisp.org"],
         })
 
-        expected = '''config: /etc/network/interfaces
+        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
+# config: /etc/resolv.conf
 nameserver 10.11.12.13
 nameserver 8.8.8.8
 search netjson.org
@@ -361,7 +361,7 @@ def test_loopback(self):
             ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto lo
 iface lo inet static
     address 127.0.0.1
@@ -386,7 +386,7 @@ def test_adhoc_wireless(self):
             ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto wireless
 iface wireless inet static
     address 172.128.1.1
@@ -413,7 +413,7 @@ def test_simple_bridge(self):
                     ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto br-lan
     bridge_ports eth0 eth1
 
@@ -443,7 +443,7 @@ def test_complex_bridge(self):
             ]
         })
 
-        expected = '''config: /etc/network/interfaces
+        expected = '''# config: /etc/network/interfaces
 auto brwifi
 iface brwifi inet6 static
     address fe80::8029:23ff:fe7d:c214

tests/raspbian/test_resolv.py

@@ -14,7 +14,7 @@ def test_dns_server(self):
             ],
         })
 
-        expected = '''config: /etc/resolv.conf
+        expected = '''# config: /etc/resolv.conf
 nameserver 10.254.0.1
 nameserver 10.254.0.2
 '''
@@ -27,7 +27,7 @@ def test_dns_search(self):
             ],
         })
 
-        expected = '''config: /etc/resolv.conf
+        expected = '''# config: /etc/resolv.conf
 search domain.com
 '''
         self.assertEqual(o.render(), expected)
@@ -43,7 +43,7 @@ def test_dns_server_and_dns_search(self):
             ],
         })
 
-        expected = '''config: /etc/resolv.conf
+        expected = '''# config: /etc/resolv.conf
 nameserver 10.11.12.13
 nameserver 8.8.8.8
 search netjson.org