[chores] Changed device_pk to device_id for consistency with docs

The URL params appear in the API docs and in the unified docs too,
but the format used was different and inconsistent.

Author: nemesifier

openwisp_controller/connection/api/urls.py

@@ -11,12 +11,12 @@ def get_api_urls(api_views):
     """
     return [
         path(
-            'api/v1/controller/device/<uuid:device_pk>/command/',
+            'api/v1/controller/device/<uuid:device_id>/command/',
             api_views.command_list_create_view,
             name='device_command_list',
         ),
         path(
-            'api/v1/controller/device/<uuid:device_pk>/command/<uuid:pk>/',
+            'api/v1/controller/device/<uuid:device_id>/command/<uuid:pk>/',
             api_views.command_details_view,
             name='device_command_details',
         ),
@@ -31,12 +31,12 @@ def get_api_urls(api_views):
             name='credential_detail',
         ),
         path(
-            'api/v1/controller/device/<uuid:device_pk>/connection/',
+            'api/v1/controller/device/<uuid:device_id>/connection/',
             api_views.deviceconnection_list_create_view,
             name='deviceconnection_list',
         ),
         path(
-            'api/v1/controller/device/<uuid:device_pk>/connection/<uuid:pk>/',
+            'api/v1/controller/device/<uuid:device_id>/connection/<uuid:pk>/',
             api_views.deviceconnection_details_view,
             name='deviceconnection_detail',
         ),

openwisp_controller/connection/api/views.py

@@ -49,15 +49,15 @@ def get_permissions(self):
 
     def get_parent_queryset(self):
         return Device.objects.filter(
-            pk=self.kwargs['device_pk'],
+            pk=self.kwargs['device_id'],
         )
 
     def get_queryset(self):
-        return super().get_queryset().filter(device_id=self.kwargs['device_pk'])
+        return super().get_queryset().filter(device_id=self.kwargs['device_id'])
 
     def get_serializer_context(self):
         context = super().get_serializer_context()
-        context['device_id'] = self.kwargs['device_pk']
+        context['device_id'] = self.kwargs['device_id']
         return context
 
 
@@ -101,7 +101,7 @@ def get_queryset(self):
 
     def get_serializer_context(self):
         context = super().get_serializer_context()
-        context['device_id'] = self.kwargs['device_pk']
+        context['device_id'] = self.kwargs['device_id']
         return context
 
     def initial(self, *args, **kwargs):
@@ -112,11 +112,11 @@ def assert_parent_exists(self):
         try:
             assert self.get_parent_queryset().exists()
         except (AssertionError, ValidationError):
-            device_id = self.kwargs['device_pk']
+            device_id = self.kwargs['device_id']
             raise NotFound(detail=f'Device with ID "{device_id}" not found.')
 
     def get_parent_queryset(self):
-        return Device.objects.filter(pk=self.kwargs['device_pk'])
+        return Device.objects.filter(pk=self.kwargs['device_id'])
 
 
 class DeviceConnenctionListCreateView(BaseDeviceConnection, ListCreateAPIView):
@@ -126,7 +126,7 @@ def get_queryset(self):
         return (
             super()
             .get_queryset()
-            .filter(device_id=self.kwargs['device_pk'])
+            .filter(device_id=self.kwargs['device_id'])
             .order_by('-created')
         )
 

openwisp_controller/connection/apps.py

@@ -81,14 +81,14 @@ def command_save_receiver(cls, sender, created, instance, **kwargs):
         )
 
     @classmethod
-    def _launch_update_config(cls, device_pk):
+    def _launch_update_config(cls, device_id):
         """
         Calls the background task update_config only if
         no other tasks are running for the same device
         """
         from .tasks import update_config
 
-        update_config.delay(device_pk)
+        update_config.delay(device_id)
 
     @classmethod
     def is_working_changed_receiver(

openwisp_controller/connection/tasks.py

@@ -15,14 +15,14 @@
 _TASK_NAME = 'openwisp_controller.connection.tasks.update_config'
 
 
-def _is_update_in_progress(device_pk):
+def _is_update_in_progress(device_id):
     active = current_app.control.inspect().active()
     if not active:
         return False
     # check if there's any other running task before adding it
     for task_list in active.values():
         for task in task_list:
-            if task['name'] == _TASK_NAME and str(device_pk) in task['args']:
+            if task['name'] == _TASK_NAME and str(device_id) in task['args']:
                 return True
     return False