[chores] Added allowed commands to model method

Modified `get_org_choices` method to fetch choices
as list of tuples to support labels wherever
possible.
Refactored test cases

Signed-off-by: DragnEmperor <dragnemperor@gmail.com>

Author: DragnEmperor

openwisp_controller/connection/api/serializers.py

@@ -41,12 +41,9 @@ def __init__(self, *args, **kwargs):
             ].queryset.filter(device_id=device_id)
             device = Device.objects.only('organization_id', 'id').get(pk=device_id)
             # filter command types based on the device's organization
-            allowed_commands = Command.get_org_choices(device.organization_id)
-            # this translates the commands to their labels
-            commands_map = dict(COMMAND_CHOICES)
-            self.fields['type'].choices = [
-                (i, commands_map[i]) for i in commands_map if i in allowed_commands
-            ]
+            self.fields['type'].choices = Command.get_org_allowed_commands(
+                device.organization_id
+            )
 
     def to_representation(self, instance):
         repr = super().to_representation(instance)

openwisp_controller/connection/base/models.py

@@ -437,10 +437,15 @@ class Meta:
         ordering = ('created',)
 
     @classmethod
-    def get_org_choices(self, organization_id=None):
-        return ORGANIZATION_ENABLED_COMMANDS.get(
+    def get_org_allowed_commands(self, organization_id=None):
+        """
+        Returns a list of allowed commands for the given organization
+        """
+        allowed_commands = ORGANIZATION_ENABLED_COMMANDS.get(
             str(organization_id), ORGANIZATION_ENABLED_COMMANDS.get('__all__')
         )
+        commands_map = dict(COMMAND_CHOICES)
+        return [(i, commands_map[i]) for i in commands_map if i in allowed_commands]
 
     @classmethod
     def get_org_schema(self, organization_id=None):
@@ -476,8 +481,9 @@ def _verify_command_type_allowed(self):
         # (standard model validation will kick in)
         if not hasattr(self, 'device'):
             return
-        if self.type not in self.get_org_choices(
-            organization_id=self.device.organization_id
+
+        if self.type not in dict(
+            self.get_org_allowed_commands(organization_id=self.device.organization_id)
         ):
             raise ValidationError(
                 {

openwisp_controller/connection/tests/test_api.py

@@ -355,7 +355,7 @@ def test_non_existent_command(self):
             self.assertEqual(response.status_code, 400)
             self.assertIn(
                 '"custom" is not a valid choice.',
-                response.json()['type'][0],
+                response.data['type'][0],
             )
 
     def test_create_command_without_connection(self):
@@ -373,9 +373,9 @@ def test_create_command_without_connection(self):
             content_type='application/json',
         )
         self.assertEqual(response.status_code, 400)
-        self.assertDictEqual(
-            response.json(),
-            {'device': ['Device has no credentials assigned.']},
+        self.assertIn(
+            'Device has no credentials assigned.',
+            response.data['device'][0],
         )
 
 

openwisp_controller/connection/tests/test_models.py

@@ -564,14 +564,10 @@ def test_command_validation(self):
                 )
 
         with self.subTest('Test command creation without device connection'):
-            device = self._create_device(
-                name='default.test.device2', mac_address='11:22:33:44:55:66'
-            )
-            new_command = Command(
-                device=device, type='custom', input={'command': 'echo test'}
-            )
+            device = dc.device
+            device.deviceconnection_set.all().delete()
             with self.assertRaises(ValidationError) as context_manager:
-                new_command.full_clean()
+                command.full_clean()
             exception = context_manager.exception
             self.assertIn('device', exception.message_dict)
             self.assertEqual(