[req-changes] Set 'he' field to 'None' when information is unavailable

openwisp · May 5, 2023 · 62ea6ef · 62ea6ef
1 parent c6099be
commit 62ea6ef
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/openwisp_monitoring/device/base/models.py b/openwisp_monitoring/device/base/models.py
@@ -374,7 +374,7 @@ class AbstractWifiClient(TimeStampedEditableModel):
         help_text=_('MAC address'),
     )
     vendor = models.CharField(max_length=200, blank=True, null=True)
-    he = models.BooleanField(null=True, blank=True, default=False, verbose_name='HE')
+    he = models.BooleanField(null=True, blank=True, default=None, verbose_name='HE')
     vht = models.BooleanField(null=True, blank=True, default=None, verbose_name='VHT')
     ht = models.BooleanField(null=True, blank=True, default=None, verbose_name='HT')
     wmm = models.BooleanField(default=False, verbose_name='WMM')

diff --git a/openwisp_monitoring/device/migrations/0007_add_wificlient_field_he.py b/openwisp_monitoring/device/migrations/0007_add_wificlient_field_he.py
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
             model_name='wificlient',
             name='he',
             field=models.BooleanField(
-                blank=True, default=False, null=True, verbose_name='HE'
+                blank=True, default=None, null=True, verbose_name='HE'
             ),
         ),
     ]
diff --git a/openwisp_monitoring/device/tasks.py b/openwisp_monitoring/device/tasks.py
@@ -61,11 +61,6 @@ def save_wifi_clients_and_sessions(device_data, device_pk):
             update_fields = []
             for field in _WIFICLIENT_FIELDS:
                 if getattr(client_obj, field) != client.get(field):
-                    # The wifi 6 client information (he) is optional
-                    # so when it is not available, we should make
-                    # sure its default value remains unchanged ie. False
-                    if field == 'he' and field not in client:
-                        continue
                     setattr(client_obj, field, client.get(field))
                     update_fields.append(field)
             if update_fields:

diff --git a/openwisp_monitoring/device/tests/test_models.py b/openwisp_monitoring/device/tests/test_models.py
@@ -743,7 +743,7 @@ def test_wifi_client_session_created(self):
 
         wifi_client2 = WifiClient.objects.get(mac_address='b0:e1:7e:30:16:44')
         self.assertEqual(wifi_client2.vendor, None)
-        self.assertEqual(wifi_client2.he, False)
+        self.assertEqual(wifi_client2.he, None)
         self.assertEqual(wifi_client2.vht, False)
         self.assertEqual(wifi_client2.ht, True)
         self.assertEqual(wifi_client2.wmm, True)
@@ -752,7 +752,7 @@ def test_wifi_client_session_created(self):
 
         wifi_client3 = WifiClient.objects.get(mac_address='c0:ee:fb:34:f5:4b')
         self.assertEqual(wifi_client3.vendor, None)
-        self.assertEqual(wifi_client3.he, False)
+        self.assertEqual(wifi_client3.he, None)
         self.assertEqual(wifi_client3.vht, False)
         self.assertEqual(wifi_client3.ht, True)
         self.assertEqual(wifi_client3.wmm, True)

diff --git a/tests/openwisp2/sample_device_monitoring/migrations/0001_initial.py b/tests/openwisp2/sample_device_monitoring/migrations/0001_initial.py
@@ -143,7 +143,7 @@ class Migration(migrations.Migration):
                 (
                     'he',
                     models.BooleanField(
-                        blank=True, default=False, null=True, verbose_name='HE'
+                        blank=True, default=None, null=True, verbose_name='HE'
                     ),
                 ),
                 ('wmm', models.BooleanField(default=False, verbose_name='WMM')),