[chores] Minor refactoring, update docs

Signed-off-by: DragnEmperor <[email protected]>

Author: DragnEmperor

docs/user/whois.rst

@@ -45,17 +45,6 @@ met:
 - There is **no existing WHOIS record** for that IP.
 - WHOIS lookup is **enabled** for the device's organization.
 
-Handling Existing Devices
--------------------------
-
-For creating WHOIS records for existing devices, run the ``clear_last_ip``
-management command, to clear the last IP address of **all active devices
-across organizations**. Active devices will update their last IP address,
-triggering the WHOIS lookup automatically.
-
-It accepts an optional flag ``--whois-related`` to exclude devices with
-WHOIS records.
-
 Managing WHOIS Records
 ----------------------
 
@@ -88,6 +77,26 @@ Setup Instructions
    - Set :ref:`OPENWISP_CONTROLLER_WHOIS_GEOIP_ACCOUNT` to **Account ID**.
    - Set :ref:`OPENWISP_CONTROLLER_WHOIS_GEOIP_KEY` to **License Key**.
 
+6. Restart the application/containers if using ansible-openwisp2 or
+   docker.
+7. Run the ``clear_last_ip`` management command to clear the last IP
+   address of **all active devices across organizations**.
+
+   - If using ansible-openwisp2 (default directory is /opt/openwisp2,
+     unless changed in Ansible playbook configuration):
+
+     .. code-block:: bash
+
+         source /opt/openwisp2/env/bin/activate
+         python /opt/openwisp2/src/manage.py clear_last_ip
+
+   - If using docker:
+
+     .. code-block:: bash
+
+         docker exec -it <openwisp_container_name> sh
+         python manage.py clear_last_ip
+
 Viewing WHOIS Lookup Data
 -------------------------
 

openwisp_controller/config/management/commands/clear_last_ip.py

@@ -16,14 +16,13 @@ def add_arguments(self, parser):
             dest="interactive",
             help="Do NOT prompt the user for input of any kind.",
         )
-        parser.add_argument(
-            "--whois-related",
-            action="store_true",
-            help="Clear only those IPs having no WHOIS information.",
-        )
         return super().add_arguments(parser)
 
     def handle(self, *args, **options):
+        if not app_settings.WHOIS_CONFIGURED:
+            self.stdout.write("WHOIS must be configured to use this option.")
+            return
+
         Device = load_model("config", "Device")
         WHOISInfo = load_model("config", "WHOISInfo")
 
@@ -39,20 +38,15 @@ def handle(self, *args, **options):
             if input("".join(message)) != "yes":
                 raise CommandError("Operation cancelled by user.")
 
-        devices = Device.objects.filter(_is_deactivated=False).exclude(last_ip=None)
-        devices = devices.only("last_ip")
-        if options["whois_related"]:
-            if not app_settings.WHOIS_CONFIGURED:
-                self.stdout.write("WHOIS must be configured to use this option.")
-                return
-            # Filter devices that have no WHOIS information for their last IP
-            devices = devices.exclude(
-                last_ip__in=Subquery(
-                    WHOISInfo.objects.filter(ip_address=OuterRef("last_ip")).values(
-                        "ip_address"
-                    )
+        devices = Device.objects.filter(_is_deactivated=False).only("last_ip")
+        # Filter devices that have no WHOIS information for their last IP
+        devices = devices.exclude(last_ip=None).exclude(
+            last_ip__in=Subquery(
+                WHOISInfo.objects.filter(ip_address=OuterRef("last_ip")).values(
+                    "ip_address"
                 )
-            )
+            ),
+        )
 
         updated_devices = devices.update(last_ip=None)
         if updated_devices:

openwisp_controller/config/whois/test_whois.py

@@ -279,27 +279,6 @@ def test_last_ip_management_command(self):
         device.refresh_from_db()
         self.assertIsNone(device.last_ip)
 
-        device.last_ip = "172.217.22.11"
-        device.save()
-        self._create_whois_info(ip_address=device.last_ip)
-        device2 = self._create_device(
-            name="11:22:33:44:55:66",
-            mac_address="11:22:33:44:55:66",
-            last_ip="172.217.22.12",
-        )
-        args.append("--whois-related")
-        call_command("clear_last_ip", *args, stdout=out, stderr=StringIO())
-        self.assertIn(
-            "Cleared last IP addresses for 1 active device(s).", out.getvalue()
-        )
-        device.refresh_from_db()
-        device2.refresh_from_db()
-        self.assertIsNotNone(device.last_ip)
-        self.assertIsNone(device2.last_ip)
-
-        device.last_ip = None
-        WHOISInfo.objects.all().delete()
-        device.save()
         call_command("clear_last_ip", *args, stdout=out, stderr=StringIO())
         self.assertIn("No active devices with last IP to clear.", out.getvalue())