[openwrt] Removed automatic timezone #87

Closes #87

Author: nemesifier

netjsonconfig/backends/openwrt/converters/general.py

@@ -19,15 +19,14 @@ def to_intermediate_loop(self, block, result, index=None):
     def __intermediate_system(self, general):
         if not general:
             return None
-        timezone_human = general.get('timezone', 'UTC')
-        timezone_value = timezones[timezone_human]
         general.update({
             '.type': 'system',
             '.name': general.pop('id', 'system'),
             'hostname': general.get('hostname', 'OpenWRT'),
-            'timezone': timezone_value,
-            'zonename': timezone_human,
         })
+        if 'timezone' in general:
+            general['zonename'] = general['timezone']
+            general['timezone'] = timezones[general['timezone']]
         return [self.sorted_dict(general)]
 
     def __intermediate_ula(self, general):

tests/openwrt/test_system.py

@@ -31,6 +31,22 @@ def test_parse_system(self):
         o = OpenWrt(native=self._system_uci)
         self.assertDictEqual(o.config, self._system_netjson)
 
+    _system_simple_netjson = {"general": {"hostname": "test-system"}}
+    _system_simple_uci = """package system
+
+config system 'system'
+    option hostname 'test-system'
+"""
+
+    def test_render_system_without_timezone(self):
+        o = OpenWrt(self._system_simple_netjson)
+        expected = self._tabs(self._system_simple_uci)
+        self.assertEqual(o.render(), expected)
+
+    def test_parse_system_without_timezone(self):
+        o = OpenWrt(native=self._system_simple_uci)
+        self.assertEqual(o.config, self._system_simple_netjson)
+
     _system_id_netjson = {
         "general": {
             "id": "arbitrary",