[chores] Made schema more consistent

additionalItems is always False
required properties are defined in the object, not in the array

Author: nemesifier

openwisp_monitoring/device/schema.py

@@ -138,7 +138,7 @@
             "type": "array",
             "title": "Interfaces",
             "uniqueItems": True,
-            "additionalItems": True,
+            "additionalItems": False,
             "items": {
                 "type": "object",
                 "title": "Interface",
@@ -200,26 +200,25 @@
                                 "type": "array",
                                 "title": "Wireless Clients",
                                 "additionalItems": False,
-                                "required": [
-                                    "aid",
-                                    "assoc",
-                                    "auth",
-                                    "authorized",
-                                    "ht",
-                                    "vht",
-                                    "wds",
-                                    "wmm",
-                                    "wps",
-                                    "mac",
-                                    "mfp",
-                                    "preauth",
-                                    "rrm",
-                                    "signature",
-                                ],
                                 "items": {
                                     "type": "object",
                                     "title": "Client",
                                     "additionalProperties": False,
+                                    "required": [
+                                        "aid",
+                                        "assoc",
+                                        "auth",
+                                        "authorized",
+                                        "ht",
+                                        "vht",
+                                        "wds",
+                                        "wmm",
+                                        "wps",
+                                        "mac",
+                                        "mfp",
+                                        "preauth",
+                                        "signature",
+                                    ],
                                     "properties": {
                                         "aid": {"type": "integer"},
                                         "assoc": {"type": "boolean"},
@@ -239,7 +238,6 @@
                                             "type": "array",
                                             "minItems": 5,
                                             "maxItems": 5,
-                                            "additionalItems": False,
                                             "items": {"type": "integer"},
                                         },
                                     },
@@ -251,7 +249,7 @@
                         "type": "array",
                         "title": "Addresses",
                         "uniqueItems": True,
-                        "additionalItems": True,
+                        "additionalItems": False,
                         "items": {
                             "additionalProperties": True,
                             "title": "Address",

openwisp_monitoring/device/tests/test_api.py

@@ -160,26 +160,30 @@ def test_200_multiple_measurements(self):
         # expected upload wlan1
         self.assertEqual(data['traces'][1][1][-1], 1.5)
 
-    def test_garbage_clients(self):
+    def test_garbage_wireless_clients(self):
         o = self._create_org()
         d = self._create_device(organization=o)
-        r = self._post_data(
-            d.id,
-            d.key,
+        garbage_interfaces = [
+            {'name': 'garbage1', 'wireless': {'clients': {}}},
             {
-                'type': 'DeviceMonitoring',
-                'interfaces': [
-                    {'name': 'garbage1', 'wireless': {'clients': {}}},
-                    {
-                        'name': 'garbage2',
-                        'wireless': {'clients': [{'what?': 'mac missing'}]},
-                    },
-                    {'name': 'garbage3', 'wireless': {}},
-                    {'name': 'garbage4'},
-                ],
+                'name': 'garbage2',
+                'wireless': {'clients': [{'what?': 'mac missing'}]},
             },
-        )
-        self.assertEqual(r.status_code, 400)
+            {'name': 'garbage3', 'wireless': {}}
+        ]
+        for garbage_interface in garbage_interfaces:
+            interface = self._data()['interfaces'][0]
+            interface.update(garbage_interface)
+            r = self._post_data(
+                d.id,
+                d.key,
+                {
+                    'type': 'DeviceMonitoring',
+                    'interfaces': [interface]
+                }
+            )
+            with self.subTest(garbage_interface):
+                self.assertEqual(r.status_code, 400)
 
     @patch.object(monitoring_settings, 'AUTO_CHARTS', return_value=[])
     def test_auto_chart_disabled(self, *args):