[chores] Miscellaneous improvements

Author: pandafy

openwisp_controller/config/base/config.py

@@ -23,11 +23,19 @@
 )
 from ..sortedm2m.fields import SortedManyToManyField
 from ..utils import get_default_templates_queryset
-from .base import BaseConfig, ChecksumCacheMixin
+from .base import BaseConfig, ChecksumCacheMixin, get_cached_args_rewrite
 
 logger = logging.getLogger(__name__)
 
 
+def get_cached_checksum_args_rewrite(config):
+    """
+    DEPRECATED: Use get_cached_args_rewrite instead.
+
+    """
+    return get_cached_args_rewrite(config)
+
+
 class TemplatesThrough(object):
     """
     Improves string representation of m2m relationship objects

openwisp_controller/config/base/vpn.py

@@ -148,7 +148,7 @@ class Meta:
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # for internal usage
-        self._should_send_vpn_modified_after_save = False
+        self._send_vpn_modified_after_save = False
 
     def clean(self, *args, **kwargs):
         super().clean(*args, **kwargs)
@@ -280,10 +280,10 @@ def save(self, *args, **kwargs):
             raise e
         if create_dh:
             transaction.on_commit(lambda: create_vpn_dh.delay(self.id))
-        if not created and self._should_send_vpn_modified_after_save:
+        if not created and self._send_vpn_modified_after_save:
             self.invalidate_checksum_cache()
             self._send_vpn_modified_signal()
-            self._should_send_vpn_modified_after_save = False
+            self._send_vpn_modified_after_save = False
         # For ZeroTier VPN server, if the
         # ZeroTier network is created successfully,
         # this method triggers a background task to
@@ -310,7 +310,7 @@ def _check_changes(self):
         current = self._meta.model.objects.only(*attrs).get(pk=self.pk)
         for attr in attrs:
             if getattr(self, attr) != getattr(current, attr):
-                self._should_send_vpn_modified_after_save = True
+                self._send_vpn_modified_after_save = True
                 break
 
     def _send_vpn_modified_signal(self):

openwisp_controller/config/controller/views.py

@@ -475,11 +475,9 @@ class GetVpnView(SingleObjectMixin, View):
     model = Vpn
 
     def get_object(self, *args, **kwargs):
-        queryset = (
-            self.model.objects.select_related("organization")
-            .filter(Q(organization__is_active=True) | Q(organization__isnull=True))
-            .select_related("ca", "cert", "subnet", "ip")
-        )
+        queryset = self.model.objects.select_related(
+            "organization", "ca", "cert", "subnet", "ip"
+        ).filter(Q(organization__is_active=True) | Q(organization__isnull=True))
         return get_object_or_404(queryset, *args, **kwargs)
 
     @cache_memoize(

openwisp_controller/config/tasks.py

@@ -183,6 +183,6 @@ def invalidate_controller_views_cache(organization_id):
 @shared_task(base=OpenwispCeleryTask)
 def invalidate_device_checksum_view_cache(organization_id):
     """
-    Deprecated: Use invalidate_controller_views_cache instead.
+    DEPRECATED: Use invalidate_controller_views_cache instead.
     """
     return invalidate_controller_views_cache(organization_id)

openwisp_controller/config/tests/test_vpn.py

@@ -1,4 +1,5 @@
 import json
+import uuid
 from subprocess import CalledProcessError, TimeoutExpired
 from unittest import mock
 
@@ -19,7 +20,7 @@
 from ..exceptions import ZeroTierIdentityGenerationError
 from ..settings import API_TASK_RETRY_OPTIONS
 from ..signals import config_modified, vpn_peers_changed, vpn_server_modified
-from ..tasks import create_vpn_dh
+from ..tasks import create_vpn_dh, trigger_vpn_server_endpoint
 from .utils import (
     CreateConfigTemplateMixin,
     TestVpnX509Mixin,
@@ -715,6 +716,16 @@ def test_cache_invalidation_on_vpn_changes(self):
         self.assertNotEqual(initial_checksum, vpn.get_cached_checksum())
         self.assertNotEqual(initial_config, vpn.get_cached_configuration())
 
+    def test_trigger_vpn_server_endpoint_invalid_vpn_id(self):
+        with mock.patch("logging.Logger.error") as mocked_logger:
+            vpn_id = uuid.uuid4().hex
+            trigger_vpn_server_endpoint(
+                endpoint="https://vpn_updater", auth_token="secret", vpn_id=vpn_id
+            )
+            mocked_logger.assert_called_once_with(
+                f"VPN Server UUID: {vpn_id} does not exist."
+            )
+
 
 class TestWireguardTransaction(BaseTestVpn, TestWireguardVpnMixin, TransactionTestCase):
     def test_auto_peer_configuration(self):