openwisp-controller 1.1__tar.gz → 1.1.1__tar.gz

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/CHANGES.rst

@@ -1,6 +1,23 @@
 Changelog
 =========
 
+Version 1.1.1 [2025-01-31]
+--------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Fixed `recovering deleted device with related location
+  <https://github.com/openwisp/openwisp-controller/issues/936>`__.
+- Fixed `deleting device with “deactivating” config status
+  <https://github.com/openwisp/openwisp-controller/issues/949>`__.
+- Fixed `conversion of MAC address to uppercase format
+  <https://github.com/openwisp/openwisp-controller/issues/922>`__ with the
+  openwisp-config agent.
+- Fixed `updating templates with invalid configurations to prevent
+  ValidationError due to cache invalidation mechanism
+  <https://github.com/openwisp/openwisp-controller/pull/948>`__.
+
 Version 1.1.0 [2024-11-22]
 --------------------------
 
@@ -8,14 +25,14 @@ Features
 ~~~~~~~~
 
 - Added `support for ZeroTier
-  <https://openwisp.io/docs/dev/controller/user/zerotier.html>`_.
+  <https://openwisp.io/docs/stable/controller/user/zerotier.html>`_.
 - Added support for adding `configuration templates
-  <https://openwisp.io/docs/dev/controller/user/device-groups.html#group-templates>`_
+  <https://openwisp.io/docs/stable/controller/user/device-groups.html#group-templates>`_
   and `configuration variables
-  <https://openwisp.io/docs/dev/controller/user/device-groups.html#group-configuration-variables>`_
+  <https://openwisp.io/docs/stable/controller/user/device-groups.html#group-configuration-variables>`_
   to device groups.
 - Implemented support for `SNMP credentials
-  <https://openwisp.io/docs/dev/controller/user/intro.html#snmp>`_.
+  <https://openwisp.io/docs/stable/controller/user/intro.html#snmp>`_.
 - Added support for device deactivation and reactivation.
 - Introduced an admin action to quickly move devices between groups.
 - Added autocomplete support for filters in the admin interface.
@@ -23,13 +40,13 @@ Features
   config agent.
 - Enabled filtering of subnets by Subnet Division Rule type.
 - Allowed `limiting the number of devices per organization
-  <https://openwisp.io/docs/dev/controller/user/organization-limits.html>`_.
+  <https://openwisp.io/docs/stable/controller/user/organization-limits.html>`_.
 - Added support for defining organization-level variables.
 - Enabled `bulk import and export of devices
-  <https://openwisp.io/docs/dev/controller/user/import-export.html>`_.
+  <https://openwisp.io/docs/stable/controller/user/import-export.html>`_.
 - Added `functionality to configure available commands for each
   organization
-  <https://openwisp.io/docs/dev/controller/user/settings.html#openwisp-controller-organization-enabled-commands>`_.
+  <https://openwisp.io/docs/stable/controller/user/settings.html#openwisp-controller-organization-enabled-commands>`_.
 - Added a dashboard chart showing the distribution of devices across
   different groups.
 - Added filters to the REST API.

{openwisp_controller-1.1/openwisp_controller.egg-info → openwisp_controller-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: openwisp-controller
-Version: 1.1
+Version: 1.1.1
 Summary: OpenWISP Controller
 Home-page: http://openwisp.org
 Download-URL: https://github.com/openwisp/openwisp-controller/releases
@@ -37,6 +37,17 @@ Requires-Dist: django-cache-memoize~=0.2.0
 Requires-Dist: shortuuid~=1.0.13
 Requires-Dist: netaddr~=1.3.0
 Requires-Dist: django-import-export~=3.3.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
 
 openwisp-controller
 ===================
@@ -89,30 +100,31 @@ built on top of its building blocks.
 
 Other popular building blocks that are part of the OpenWISP ecosystem are:
 
-- `openwisp-monitoring <https://openwisp.io/docs/dev/monitoring/>`_:
+- `openwisp-monitoring <https://openwisp.io/docs/stable/monitoring/>`_:
   provides device status monitoring, collection of metrics, charts,
   alerts, possibility to define custom checks
 - `openwisp-firmware-upgrader
-  <https://openwisp.io/docs/dev/firmware-upgrader/>`_: automated firmware
-  upgrades (single devices or mass network upgrades)
-- `openwisp-radius <https://openwisp.io/docs/dev/user/radius.html>`_:
+  <https://openwisp.io/docs/stable/firmware-upgrader/>`_: automated
+  firmware upgrades (single devices or mass network upgrades)
+- `openwisp-radius <https://openwisp.io/docs/stable/user/radius.html>`_:
   based on FreeRADIUS, allows to implement network access authentication
   systems like 802.1x WPA2 Enterprise, captive portal authentication,
   Hotspot 2.0 (802.11u)
 - `openwisp-network-topology
-  <https://openwisp.io/docs/dev/network-topology/>`_: provides way to
+  <https://openwisp.io/docs/stable/network-topology/>`_: provides way to
   collect and visualize network topology data from dynamic mesh routing
   daemons or other network software (e.g.: OpenVPN); it can be used in
   conjunction with openwisp-monitoring to get a better idea of the state
   of the network
-- `openwisp-ipam <https://openwisp.io/docs/dev/ipam/>`_: allows to manage
-  the assignment of IP addresses used in the network
-- `openwisp-notifications <https://openwisp.io/docs/dev/notifications/>`_:
-  allows users to be aware of important events happening in the network.
+- `openwisp-ipam <https://openwisp.io/docs/stable/ipam/>`_: allows to
+  manage the assignment of IP addresses used in the network
+- `openwisp-notifications
+  <https://openwisp.io/docs/stable/notifications/>`_: allows users to be
+  aware of important events happening in the network.
 
 **For a more complete overview of the OpenWISP modules and architecture**,
 see the `OpenWISP Architecture Overview
-<https://openwisp.io/docs/dev/general/architecture.html>`_.
+<https://openwisp.io/docs/stable/general/architecture.html>`_.
 
 .. image:: https://raw.githubusercontent.com/openwisp/openwisp2-docs/master/assets/design/openwisp-logo-black.svg
     :target: http://openwisp.org
@@ -121,9 +133,9 @@ see the `OpenWISP Architecture Overview
 Documentation
 -------------
 
-- `Usage documentation <https://openwisp.io/docs/dev/controller/>`_
+- `Usage documentation <https://openwisp.io/docs/stable/controller/>`_
 - `Developer documentation
-  <https://openwisp.io/docs/dev/controller/developer/>`_
+  <https://openwisp.io/docs/stable/controller/developer/>`_
 
 Contributing
 ------------

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/README.rst

@@ -49,30 +49,31 @@ built on top of its building blocks.
 
 Other popular building blocks that are part of the OpenWISP ecosystem are:
 
-- `openwisp-monitoring <https://openwisp.io/docs/dev/monitoring/>`_:
+- `openwisp-monitoring <https://openwisp.io/docs/stable/monitoring/>`_:
   provides device status monitoring, collection of metrics, charts,
   alerts, possibility to define custom checks
 - `openwisp-firmware-upgrader
-  <https://openwisp.io/docs/dev/firmware-upgrader/>`_: automated firmware
-  upgrades (single devices or mass network upgrades)
-- `openwisp-radius <https://openwisp.io/docs/dev/user/radius.html>`_:
+  <https://openwisp.io/docs/stable/firmware-upgrader/>`_: automated
+  firmware upgrades (single devices or mass network upgrades)
+- `openwisp-radius <https://openwisp.io/docs/stable/user/radius.html>`_:
   based on FreeRADIUS, allows to implement network access authentication
   systems like 802.1x WPA2 Enterprise, captive portal authentication,
   Hotspot 2.0 (802.11u)
 - `openwisp-network-topology
-  <https://openwisp.io/docs/dev/network-topology/>`_: provides way to
+  <https://openwisp.io/docs/stable/network-topology/>`_: provides way to
   collect and visualize network topology data from dynamic mesh routing
   daemons or other network software (e.g.: OpenVPN); it can be used in
   conjunction with openwisp-monitoring to get a better idea of the state
   of the network
-- `openwisp-ipam <https://openwisp.io/docs/dev/ipam/>`_: allows to manage
-  the assignment of IP addresses used in the network
-- `openwisp-notifications <https://openwisp.io/docs/dev/notifications/>`_:
-  allows users to be aware of important events happening in the network.
+- `openwisp-ipam <https://openwisp.io/docs/stable/ipam/>`_: allows to
+  manage the assignment of IP addresses used in the network
+- `openwisp-notifications
+  <https://openwisp.io/docs/stable/notifications/>`_: allows users to be
+  aware of important events happening in the network.
 
 **For a more complete overview of the OpenWISP modules and architecture**,
 see the `OpenWISP Architecture Overview
-<https://openwisp.io/docs/dev/general/architecture.html>`_.
+<https://openwisp.io/docs/stable/general/architecture.html>`_.
 
 .. image:: https://raw.githubusercontent.com/openwisp/openwisp2-docs/master/assets/design/openwisp-logo-black.svg
     :target: http://openwisp.org
@@ -81,9 +82,9 @@ see the `OpenWISP Architecture Overview
 Documentation
 -------------
 
-- `Usage documentation <https://openwisp.io/docs/dev/controller/>`_
+- `Usage documentation <https://openwisp.io/docs/stable/controller/>`_
 - `Developer documentation
-  <https://openwisp.io/docs/dev/controller/developer/>`_
+  <https://openwisp.io/docs/stable/controller/developer/>`_
 
 Contributing
 ------------

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/openwisp_controller/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 1, 0, 'final')
+VERSION = (1, 1, 1, 'final')
 __version__ = VERSION  # alias
 
 

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/openwisp_controller/config/admin.py

@@ -1,11 +1,13 @@
 import json
 import logging
+from collections.abc import Iterable
 
 import reversion
 from django import forms
 from django.conf import settings
 from django.contrib import admin, messages
 from django.contrib.admin import helpers
+from django.contrib.admin.actions import delete_selected
 from django.contrib.admin.models import ADDITION, LogEntry
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import (
@@ -566,8 +568,6 @@ class DeviceAdmin(MultitenantAdminMixin, BaseConfigAdmin, UUIDAdmin):
         perm = super().has_delete_permission(request)
         if not obj:
             return perm
-        if obj._has_config():
-            perm = perm and obj.config.is_deactivated()
         return perm and obj.is_deactivated()
 
     def save_form(self, request, form, change):
@@ -765,22 +765,42 @@ class DeviceAdmin(MultitenantAdminMixin, BaseConfigAdmin, UUIDAdmin):
     def activate_device(self, request, queryset):
         self._change_device_status(request, queryset, 'activate')
 
-    def get_deleted_objects(self, objs, request, *args, **kwargs):
-        # Ensure that all selected devices can be deleted, i.e.
-        # the device should be flagged as deactivated and if it has
-        # a config object, it's status should be "deactivated".
-        active_devices = []
-        for obj in objs:
-            if not self.has_delete_permission(request, obj):
-                active_devices.append(obj)
-        if active_devices:
-            return (
-                active_devices,
-                {self.model._meta.verbose_name_plural: len(active_devices)},
-                ['active_devices'],
-                [],
+    @admin.action(description=delete_selected.short_description, permissions=['delete'])
+    def delete_selected(self, request, queryset):
+        response = delete_selected(self, request, queryset)
+        if not response:
+            return response
+        if 'active_devices' in response.context_data.get('perms_lacking', {}):
+            active_devices = []
+            for device in queryset.iterator():
+                if not device.is_deactivated() or (
+                    device._has_config() and not device.config.is_deactivated()
+                ):
+                    active_devices.append(self._get_device_path(device))
+            response.context_data.update(
+                {
+                    'active_devices': active_devices,
+                    'perms_lacking': set(),
+                    'title': _('Are you sure?'),
+                }
             )
-        return super().get_deleted_objects(objs, request, *args, **kwargs)
+        return response
+
+    def get_deleted_objects(self, objs, request, *args, **kwargs):
+        to_delete, model_count, perms_needed, protected = super().get_deleted_objects(
+            objs, request, *args, **kwargs
+        )
+        if (
+            isinstance(perms_needed, Iterable)
+            and len(perms_needed) == 1
+            and list(perms_needed)[0] == self.model._meta.verbose_name
+            and objs.filter(_is_deactivated=False).exists()
+        ):
+            if request.POST.get("post"):
+                perms_needed = set()
+            else:
+                perms_needed = {'active_devices'}
+        return to_delete, model_count, perms_needed, protected
 
     def get_fields(self, request, obj=None):
         """
@@ -900,6 +920,17 @@ class DeviceAdmin(MultitenantAdminMixin, BaseConfigAdmin, UUIDAdmin):
         request._recover_view = True
         return super().recover_view(request, version_id, extra_context)
 
+    def delete_view(self, request, object_id, extra_context=None):
+        extra_context = extra_context or {}
+        obj = self.get_object(request, object_id)
+        if obj and obj._has_config() and not obj.config.is_deactivated():
+            extra_context['deactivating_warning'] = True
+        return super().delete_view(request, object_id, extra_context)
+
+    def delete_model(self, request, obj):
+        force_delete = request.POST.get('force_delete') == 'true'
+        obj.delete(check_deactivated=not force_delete)
+
     def get_inlines(self, request, obj):
         inlines = super().get_inlines(request, obj)
         # this only makes sense in existing devices

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/openwisp_controller/config/api/views.py

@@ -107,6 +107,10 @@ class DeviceDetailView(ProtectedAPIMixin, RetrieveUpdateDestroyAPIView):
     queryset = Device.objects.select_related('config', 'group', 'organization')
     permission_classes = ProtectedAPIMixin.permission_classes + (DevicePermission,)
 
+    def perform_destroy(self, instance):
+        force_deletion = self.request.query_params.get('force', None) == 'true'
+        instance.delete(check_deactivated=(not force_deletion))
+
 
 class DeviceActivateView(ProtectedAPIMixin, GenericAPIView):
     serializer_class = serializers.Serializer

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/openwisp_controller/config/base/device.py

@@ -262,6 +262,7 @@ class AbstractDevice(OrgMixin, BaseModel):
 
     def clean(self, *args, **kwargs):
         super().clean(*args, **kwargs)
+        self.mac_address = self.mac_address.upper()
         self._validate_unique_name()
         self._validate_org_relation('group', field_error='group')
         self._validate_org_device_limit()

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/openwisp_controller/config/base/template.py

@@ -6,6 +6,7 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models, transaction
 from django.utils.translation import gettext_lazy as _
 from jsonfield import JSONField
+from netjsonconfig.exceptions import ValidationError as NetjsonconfigValidationError
 from swapper import get_model_name
 from taggit.managers import TaggableManager
 
@@ -115,7 +116,14 @@ class AbstractTemplate(ShareableOrgMixinUniqueName, BaseConfig):
             if hasattr(self, 'backend_instance'):
                 del self.backend_instance
             current = self.__class__.objects.get(pk=self.pk)
-            update_related_config_status = self.checksum != current.checksum
+            try:
+                current_checksum = current.checksum
+            except NetjsonconfigValidationError:
+                # If the Netjsonconfig library upgrade changes the schema,
+                # the old configuration may become invalid, raising an exception.
+                # Setting the checksum to None forces related configurations to update.
+                current_checksum = None
+            update_related_config_status = self.checksum != current_checksum
         # save current changes
         super().save(*args, **kwargs)
         # update relations

openwisp_controller-1.1.1/openwisp_controller/config/static/config/css/device-delete-confirmation.css

@@ -0,0 +1,11 @@
+#deactivating-warning .warning p {
+  margin-top: 0px;
+}
+#main ul.messagelist li.warning ul li {
+  display: list-item;
+  padding: 0px;
+  background: inherit;
+}
+ul.messagelist li {
+  font-size: unset;
+}

openwisp_controller-1.1.1/openwisp_controller/config/static/config/js/device-delete-confirmation.js

@@ -0,0 +1,12 @@
+"use strict";
+
+(function ($) {
+  $(document).ready(function () {
+    $("#warning-ack").click(function (event) {
+      event.preventDefault();
+      $("#deactivating-warning").slideUp("fast");
+      $("#delete-confirm-container").slideDown("fast");
+      $('input[name="force_delete"]').val("true");
+    });
+  });
+})(django.jQuery);

openwisp_controller-1.1.1/openwisp_controller/config/templates/admin/config/device/delete_confirmation.html

@@ -0,0 +1,81 @@
+{% extends "admin/delete_confirmation.html" %}
+{% load i18n static %}
+
+{% block extrastyle %}
+{{ block.super }}
+<link rel="stylesheet" type="text/css" href="{% static 'config/css/device-delete-confirmation.css' %}" />
+{% endblock extrastyle %}
+
+{% block content %}
+{% if perms_lacking %}
+    <p>{% blocktranslate with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktranslate %}</p>
+    <ul>
+    {% for obj in perms_lacking %}
+        <li>{{ obj }}</li>
+    {% endfor %}
+    </ul>
+{% elif protected %}
+    <p>{% blocktranslate with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would require deleting the following protected related objects:{% endblocktranslate %}</p>
+    <ul>
+    {% for obj in protected %}
+        <li>{{ obj }}</li>
+    {% endfor %}
+    </ul>
+{% else %}
+    {% if deactivating_warning %}
+    <div id="deactivating-warning">
+        <ul class="messagelist">
+            <li class="warning">
+                <p>
+                  <strong>
+                    {% translate 'Warning: Device is not fully deactivated.' %}
+                  </strong>
+                </p>
+                <p>
+                  {% blocktranslate %}
+                  This device is still in the process of being deactivated,
+                  meaning its configuration is still present on the device.
+                  {% endblocktranslate %}
+                </p>
+                <p>
+                  {% blocktranslate %}
+                  To ensure its configuration is removed, please
+                  wait until its status changes to
+                  <strong>"deactivated"</strong>.<br>
+                  If you proceed now, the device will be deleted,
+                  but its configuration will remain active.
+                  {% endblocktranslate %}
+                </p>
+                <form>
+                    <input type="submit" class="button danger-btn" id="warning-ack"
+                        value="{% translate 'I understand the risks, delete the device' %}">
+                    <a class="button cancel-link">{% translate 'No, take me back' %}</a>
+                </form>
+            </li>
+        </ul>
+    </div>
+    {% endif %}
+    <div id="delete-confirm-container" {% if deactivating_warning %}style="display:none;"{% endif %}>
+        <p>{% blocktranslate with escaped_object=object %}Are you sure you want to delete the {{ object_name }}
+            "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktranslate %}</p>
+        {% include "admin/includes/object_delete_summary.html" %}
+        <h2>{% translate "Objects" %}</h2>
+        <ul id="deleted-objects">{{ deleted_objects|unordered_list }}</ul>
+        <form method="post">{% csrf_token %}
+            <div>
+                <input type="hidden" name="post" value="yes">
+                {% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1">{% endif %}
+                {% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}">{% endif %}
+                <input type="submit" value="{% translate 'Yes, I’m sure' %}">
+                {% if deactivating_warning %}<input type="hidden" name="force_delete" value="false">{% endif %}
+                <a href="#" class="button cancel-link">{% translate "No, take me back" %}</a>
+            </div>
+        </form>
+    </div>
+{% endif %}
+{% endblock %}
+
+{% block footer %}
+{{ block.super }}
+<script type="text/javascript" src="{% static 'config/js/device-delete-confirmation.js' %}"></script>
+{% endblock %}

openwisp_controller-1.1.1/openwisp_controller/config/templates/admin/config/device/delete_selected_confirmation.html

@@ -0,0 +1,87 @@
+{% extends "admin/delete_selected_confirmation.html" %}
+{% load i18n l10n admin_urls static %}
+
+{% block extrastyle %}
+{{ block.super }}
+<link rel="stylesheet" type="text/css" href="{% static 'config/css/device-delete-confirmation.css' %}" />
+{% endblock extrastyle %}
+
+{% block content %}
+{% if perms_lacking %}
+    <p>{% blocktranslate %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktranslate %}</p>
+    <ul>{{ perms_lacking|unordered_list }}</ul>
+{% elif protected %}
+    <p>{% blocktranslate %}Deleting the selected {{ objects_name }} would require deleting the following protected related objects:{% endblocktranslate %}</p>
+    <ul>{{ protected|unordered_list }}</ul>
+{% else %}
+    {% if active_devices %}
+    <div id="deactivating-warning">
+        <ul class="messagelist">
+            <li class="warning">
+                <p>
+                  <strong>
+                    {% blocktranslate count counter=active_devices|length %}
+                    Warning: Device is not fully deactivated.
+                    {% plural %}
+                    Warning: Some devices are not fully deactivated.
+                    {% endblocktranslate %}
+                  </strong>
+                </p>
+                <p>
+                    {% blocktranslate count counter=active_devices|length %}
+                    The device below is either still active or
+                    in the process of being deactivated:
+                    {% plural %}
+                    The devices listed below are either still active
+                    or in the process of being deactivated:
+                    {% endblocktranslate %}
+                </p>
+                <ul>{{ active_devices|unordered_list }}</ul>
+                <p>
+                    {% blocktranslate count counter=active_devices|length %}
+                    To ensure its configuration is removed, please
+                    wait until its status changes to <strong>"deactivated"</strong>.<br>
+                    If you proceed now, the device will be deleted,
+                    but its configuration will remain active.
+                    {% plural %}
+                    To ensure their configurations are removed, please
+                    wait until their status changes to <strong>"deactivated"</strong>.<br>
+                    If you proceed now, the devices will be deleted,
+                    but their configurations will remain active.
+                    {% endblocktranslate %}
+                </p>
+                <form>
+                    <input type="submit" class="button danger-btn" id="warning-ack"
+                        value="{% blocktranslate count counter=active_devices|length %}I understand the risks, delete the device{% plural %}I understand the risks, delete the devices{% endblocktranslate %}">
+                    <a class="button cancel-link">{% translate 'No, take me back' %}</a>
+                </form>
+            </li>
+        </ul>
+    </div>
+    {% endif %}
+    <div id="delete-confirm-container" {% if active_devices %}style="display:none;"{% endif %}>
+        <p>{% blocktranslate %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktranslate %}</p>
+        {% include "admin/includes/object_delete_summary.html" %}
+        <h2>{% translate "Objects" %}</h2>
+        {% for deletable_object in deletable_objects %}
+            <ul>{{ deletable_object|unordered_list }}</ul>
+        {% endfor %}
+        <form method="post">{% csrf_token %}
+        <div>
+        {% for obj in queryset %}
+        <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}">
+        {% endfor %}
+        <input type="hidden" name="action" value="delete_selected">
+        <input type="hidden" name="post" value="yes">
+        <input type="submit" value="{% translate 'Yes, I’m sure' %}">
+        <a href="#" class="button cancel-link">{% translate "No, take me back" %}</a>
+        </div>
+        </form>
+    </div>
+{% endif %}
+{% endblock %}
+
+{% block footer %}
+{{ block.super }}
+<script type="text/javascript" src="{% static 'config/js/device-delete-confirmation.js' %}"></script>
+{% endblock %}

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/openwisp_controller/config/tests/test_admin.py

@@ -2120,9 +2120,8 @@ class TestTransactionAdmin(
         )
         # Save buttons are absent on deactivated device
         self.assertNotContains(response, self._save_btn_html)
-        # Delete button is not present if config status is deactivating
         self.assertEqual(device.config.status, 'deactivating')
-        self.assertNotContains(response, delete_btn_html)
+        self.assertContains(response, delete_btn_html)
         self.assertNotContains(response, self._deactivate_btn_html)
         self.assertContains(response, self._activate_btn_html)
         # Verify adding a new DeviceLocation and DeviceConnection is not allowed

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/openwisp_controller/config/tests/test_api.py

@@ -539,6 +539,22 @@ class TestConfigApi(
             self.assertEqual(response.status_code, 204)
             self.assertEqual(Device.objects.count(), 0)
 
+    def test_deactivating_device_force_deletion(self):
+        self._create_template(required=True)
+        device = self._create_device()
+        config = self._create_config(device=device)
+        device.deactivate()
+        path = reverse('config_api:device_detail', args=[device.pk])
+
+        with self.subTest(
+            'Test force deleting device with config in deactivating state'
+        ):
+            self.assertEqual(device.is_deactivated(), True)
+            self.assertEqual(config.is_deactivating(), True)
+            response = self.client.delete(f'{path}?force=true')
+            self.assertEqual(response.status_code, 204)
+            self.assertEqual(Device.objects.count(), 0)
+
     def test_template_create_no_org_api(self):
         self.assertEqual(Template.objects.count(), 0)
         path = reverse('config_api:template_list')

{openwisp_controller-1.1 → openwisp_controller-1.1.1}/openwisp_controller/config/tests/test_device.py

@@ -69,6 +69,14 @@ class TestDevice(
             else:
                 self.fail('ValidationError not raised for "{0}"'.format(mac_address))
 
+    def test_device_mac_address_uppercase(self):
+        device = self._create_device(mac_address='00:1a:2b:3c:4d:5e')
+        device.full_clean()
+        self.assertEqual(device.mac_address, '00:1A:2B:3C:4D:5E')
+        device.save()
+        device.refresh_from_db()
+        self.assertEqual(device.mac_address, '00:1A:2B:3C:4D:5E')
+
     def test_config_status_modified(self):
         c = self._create_config(device=self._create_device(), status='applied')
         self.assertEqual(c.status, 'applied')