Allow omitting { "type": "DeviceConfiguration" } #13

Closes #13
openwisp · Sep 30, 2015 · b7da52c · b7da52c
1 parent 7d83314
commit b7da52c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 34 deletions.
diff --git a/netjsonconfig/backends/openwrt/openwrt.py b/netjsonconfig/backends/openwrt/openwrt.py
@@ -25,6 +25,9 @@ def __init__(self, config):
         """
         if not isinstance(config, dict):
             raise TypeError('Config argument must be an istance of dict or one of its subclasses')
+        # allow omitting NetJSON type
+        if 'type' not in config:
+            config.update({'type': 'DeviceConfiguration'})
         self.config = config
         self.env = Environment(loader=PackageLoader('netjsonconfig.backends.openwrt', 'templates'),
                                trim_blocks=True)

diff --git a/tests/openwrt/test_backend.py b/tests/openwrt/test_backend.py
@@ -11,7 +11,6 @@ class TestBackend(unittest.TestCase):
     """
     def test_json(self):
         config = {
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "lo",
@@ -31,10 +30,6 @@ def test_json(self):
         self.assertEqual(json.loads(o.json()), config)
 
     def test_validate(self):
-        o = OpenWrt({})
-        with self.assertRaises(ValidationError):
-            o.validate()
-
         o = OpenWrt({'type': 'WRONG'})
         with self.assertRaises(ValidationError):
             o.validate()
@@ -51,7 +46,6 @@ def test_type_error(self):
 
     def test_system_invalid_timezone(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "general": {
                 "hostname": "test_system",
                 "timezone": "WRONG",
@@ -62,7 +56,6 @@ def test_system_invalid_timezone(self):
 
     def test_schema_radio_wrong_driver(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "radios": [
                 {
                     "name": "radio0",
@@ -80,7 +73,6 @@ def test_schema_radio_wrong_driver(self):
 
     def test_schema_radio_wrong_protocol(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "radios": [
                 {
                     "name": "radio0",

diff --git a/tests/openwrt/test_network.py b/tests/openwrt/test_network.py
@@ -10,7 +10,6 @@ class TestNetworkRendererer(unittest.TestCase, _TabsMixin):
     """
     def test_loopback(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "lo",
@@ -37,7 +36,6 @@ def test_loopback(self):
 
     def test_multiple_ip(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "eth0.1",
@@ -90,7 +88,6 @@ def test_multiple_ip(self):
 
     def test_dhcp(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "eth0",
@@ -114,7 +111,6 @@ def test_dhcp(self):
 
     def test_multiple_dhcp(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "eth0",
@@ -146,7 +142,6 @@ def test_multiple_dhcp(self):
 
     def test_ipv4_routes(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "eth1",
@@ -207,7 +202,6 @@ def test_ipv4_routes(self):
 
     def test_ipv6_routes(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "eth1",
@@ -260,7 +254,6 @@ def test_ipv6_routes(self):
 
     def test_additional_proto(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "mobile0",
@@ -282,7 +275,6 @@ def test_additional_proto(self):
 
     def test_interface_custom_attrs(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "mobile0",
@@ -311,7 +303,6 @@ def test_interface_custom_attrs(self):
 
     def test_eth_bridge(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "eth0",
@@ -374,7 +365,6 @@ def test_eth_bridge(self):
 
     def test_dns(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "eth0",
@@ -411,7 +401,6 @@ def test_dns(self):
 
     def test_rules(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "ip_rules": [
                 {
                     "in": "eth0",

diff --git a/tests/openwrt/test_system.py b/tests/openwrt/test_system.py
@@ -10,7 +10,6 @@ class TestSystemRendererer(unittest.TestCase, _TabsMixin):
     """
     def test_system(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "general": {
                 "hostname": "test_system",
                 "timezone": "Europe/Rome",
@@ -30,7 +29,6 @@ def test_system(self):
 
     def test_ntp(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "ntp": {
                 "enabled": True,
                 "enable_server": False,
@@ -56,7 +54,6 @@ def test_ntp(self):
 
     def test_led_1(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "led": [
                 {
                     "name": "USB1",

diff --git a/tests/openwrt/test_wireless.py b/tests/openwrt/test_wireless.py
@@ -10,7 +10,6 @@ class TestWirelessRendererer(unittest.TestCase, _TabsMixin):
     """
     def test_radio(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "radios": [
                 {
                     "name": "radio0",
@@ -60,7 +59,6 @@ def test_radio(self):
 
     def test_radio_2ghz_mac80211(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "radios": [
                 {
                     "name": "radio0",
@@ -104,7 +102,6 @@ def test_radio_2ghz_mac80211(self):
 
     def test_radio_2ghz_athk(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "radios": [
                 {
                     "name": "radio0",
@@ -148,7 +145,6 @@ def test_radio_2ghz_athk(self):
 
     def test_radio_ac_and_custom_attrs(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "radios": [
                 {
                     "name": "radio0",
@@ -180,7 +176,6 @@ def test_radio_ac_and_custom_attrs(self):
 
     def test_wifi_interfaces(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "wlan0",
@@ -243,7 +238,6 @@ def test_wifi_interfaces(self):
 
     def test_wifi_encryption_wep_open(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "wlan0",
@@ -289,7 +283,6 @@ def test_wifi_encryption_wep_open(self):
 
     def test_wifi_encryption_wep_shared(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "wlan0",
@@ -335,7 +328,6 @@ def test_wifi_encryption_wep_shared(self):
 
     def test_wifi_encryption_wpa_personal(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "wlan0",
@@ -383,7 +375,6 @@ def test_wifi_encryption_wpa_personal(self):
 
     def test_wifi_encryption_wpa2_personal(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "wlan0",
@@ -432,7 +423,6 @@ def test_wifi_encryption_wpa2_personal(self):
 
     def test_encryption_disabled(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "wlan0",
@@ -479,7 +469,6 @@ def test_encryption_disabled(self):
 
     def test_multiple_ssid(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "wlan0",
@@ -539,7 +528,6 @@ def test_multiple_ssid(self):
 
     def test_wifi_bridge(self):
         o = OpenWrt({
-            "type": "DeviceConfiguration",
             "interfaces": [
                 {
                     "name": "eth0",