openwisp-controller 1.2.1__tar.gz → 1.2.2__tar.gz

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/CHANGES.rst

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+Version 1.2.2 [2026-03-06]
+--------------------------
+
+Changes
+~~~~~~~
+
+Other changes
++++++++++++++
+
+- Improved help text of configuration variable fields
+- Minor fixes in the test suite
+
 Version 1.2.1 [2026-03-04]
 --------------------------
 

{openwisp_controller-1.2.1/openwisp_controller.egg-info → openwisp_controller-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwisp-controller
-Version: 1.2.1
+Version: 1.2.2
 Summary: OpenWISP Controller
 Home-page: http://openwisp.org
 Download-URL: https://github.com/openwisp/openwisp-controller/releases

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 2, 1, "final")
+VERSION = (1, 2, 2, "final")
 __version__ = VERSION  # alias
 
 

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/base/config.py

@@ -94,10 +94,10 @@ class AbstractConfig(ChecksumCacheMixin, BaseConfig):
         blank=True,
         default=dict,
         help_text=_(
-            "Additional "
-            '<a href="http://netjsonconfig.openwisp.org/'
-            'en/stable/general/basics.html#context" target="_blank">'
-            "context (configuration variables)</a> in JSON format"
+            "allows overriding "
+            '<a href="https://openwisp.io/docs/stable/controller/user/variables.html'
+            '" target="_blank">'
+            "configuration variables</a>"
         ),
         load_kwargs={"object_pairs_hook": collections.OrderedDict},
         dump_kwargs={"indent": 4},

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/base/device_group.py

@@ -42,8 +42,9 @@ class AbstractDeviceGroup(OrgMixin, TimeStampedEditableModel):
         load_kwargs={"object_pairs_hook": collections.OrderedDict},
         dump_kwargs={"indent": 4},
         help_text=_(
-            "Group meta data, use this field to store data which is related"
-            " to this group and can be retrieved via the REST API."
+            "Store custom metadata related to this group. This field is intended "
+            "for arbitrary data that does not affect device configuration and can "
+            "be retrieved via the REST API for integrations or external tools."
         ),
         verbose_name=_("Metadata"),
     )
@@ -53,8 +54,7 @@ class AbstractDeviceGroup(OrgMixin, TimeStampedEditableModel):
         load_kwargs={"object_pairs_hook": collections.OrderedDict},
         dump_kwargs={"indent": 4},
         help_text=_(
-            "This field can be used to add meta data for the group"
-            ' or to add "Configuration Variables" to the devices.'
+            "Define configuration variables available to all devices in this group"
         ),
         verbose_name=_("Configuration Variables"),
     )

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/base/multitenancy.py

@@ -37,7 +37,8 @@ class AbstractOrganizationConfigSettings(UUIDModel):
         load_kwargs={"object_pairs_hook": collections.OrderedDict},
         dump_kwargs={"indent": 4},
         help_text=_(
-            'This field can be used to add "Configuration Variables"' " to the devices."
+            "Define reusable configuration variables available "
+            "to all devices in this organization"
         ),
         verbose_name=_("Configuration Variables"),
     )

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/base/template.py

@@ -97,10 +97,9 @@ class AbstractTemplate(ShareableOrgMixinUniqueName, BaseConfig):
         default=dict,
         blank=True,
         help_text=_(
-            "A dictionary containing the default "
-            "values for the variables used by this "
-            "template; these default variables will "
-            "be used during schema validation."
+            "Define default values for the variables used in this template. "
+            "These values are used during validation and when a variable is "
+            "not provided by the device, group, or organization."
         ),
         load_kwargs={"object_pairs_hook": OrderedDict},
         dump_kwargs={"indent": 4},

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0023_update_context.py

@@ -18,9 +18,10 @@ class Migration(migrations.Migration):
                 default=dict,
                 dump_kwargs={"ensure_ascii": False, "indent": 4},
                 help_text=(
-                    'Additional <a href="http://netjsonconfig.openwisp.org'
-                    '/en/stable/general/basics.html#context" target="_blank">'
-                    "context (configuration variables)</a> in JSON format"
+                    "allows overriding "
+                    '<a href="https://openwisp.io/docs/stable/controller/user/variables.html'  # noqa: E501
+                    '" target="_blank">'
+                    "configuration variables</a>"
                 ),
                 load_kwargs={"object_pairs_hook": collections.OrderedDict},
             ),

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0028_template_default_values.py

@@ -18,9 +18,9 @@ class Migration(migrations.Migration):
                 default=dict,
                 dump_kwargs={"ensure_ascii": False, "indent": 4},
                 help_text=(
-                    "A dictionary containing the default values for "
-                    "the variables used by this template; these default "
-                    "variables will be used during schema validation."
+                    "Define default values for the variables used in this template. "
+                    "These values are used during validation and when a variable is "
+                    "not provided by the device, group, or organization."
                 ),
                 load_kwargs={"object_pairs_hook": collections.OrderedDict},
                 verbose_name="Default Values",

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0036_device_group.py

@@ -62,9 +62,11 @@ class Migration(migrations.Migration):
                         dump_kwargs={"ensure_ascii": False, "indent": 4},
                         load_kwargs={"object_pairs_hook": collections.OrderedDict},
                         help_text=(
-                            "Group meta data, use this field to store data which is"
-                            " related to this group and can be retrieved via the"
-                            " REST API."
+                            "Store custom metadata related to this group. "
+                            "This field is intended for arbitrary data that "
+                            "does not affect device configuration and can "
+                            "be retrieved via the REST API for integrations "
+                            "or external tools."
                         ),
                         verbose_name="Metadata",
                     ),

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0049_devicegroup_context.py

@@ -20,8 +20,8 @@ class Migration(migrations.Migration):
                 default=dict,
                 dump_kwargs={"ensure_ascii": False, "indent": 4},
                 help_text=(
-                    "This field can be used to add meta data for the group"
-                    ' or to add "Configuration Variables" to the devices.'
+                    "Define configuration variables available "
+                    "to all devices in this group"
                 ),
                 load_kwargs={"object_pairs_hook": collections.OrderedDict},
                 verbose_name="Configuration Variables",

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0051_organizationconfigsettings_context.py

@@ -20,8 +20,8 @@ class Migration(migrations.Migration):
                 default=dict,
                 dump_kwargs={"indent": 4},
                 help_text=(
-                    'This field can be used to add "Configuration Variables"'
-                    " to the devices."
+                    "Define reusable configuration variables available "
+                    "to all devices in this organization"
                 ),
                 load_kwargs={"object_pairs_hook": collections.OrderedDict},
                 verbose_name="Configuration Variables",

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2}/openwisp_controller/config/tests/test_vpn.py

@@ -3,12 +3,13 @@ import uuid
 from subprocess import CalledProcessError, TimeoutExpired
 from unittest import mock
 
+import requests
 from celery.exceptions import Retry, SoftTimeLimitExceeded
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db.models.signals import post_save
 from django.db.utils import IntegrityError
-from django.http.response import HttpResponse, HttpResponseNotFound
+from django.http.response import HttpResponse
 from django.test import TestCase, TransactionTestCase
 from requests.exceptions import ConnectionError, RequestException, Timeout
 from swapper import load_model
@@ -855,7 +856,7 @@ class TestWireguardTransaction(BaseTestVpn, TestWireguardVpnMixin, TransactionTe
             fail_response.raise_for_status.side_effect = requests.exceptions.HTTPError(
                 "Not Found"
             )
-            with mock.patch("logging.Logger.warning") as mocked_logger, mock.patch(
+            with mock.patch("logging.Logger.error") as mocked_logger, mock.patch(
                 "requests.post", return_value=fail_response
             ):
                 post_save.send(

{openwisp_controller-1.2.1 → openwisp_controller-1.2.2/openwisp_controller.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwisp-controller
-Version: 1.2.1
+Version: 1.2.2
 Summary: OpenWISP Controller
 Home-page: http://openwisp.org
 Download-URL: https://github.com/openwisp/openwisp-controller/releases