Skip to content

Conversation

@joaomariolago
Copy link
Collaborator

@joaomariolago joaomariolago commented Oct 30, 2025

Fix edge case where user does NOT have a dynamic IP requisition and loses the backup-server static IP due to external factors, resulting in watchdog not recovering it.

Summary by Sourcery

Bug Fixes:

  • Treat BackupServer mode like Server and Unmanaged modes when detecting address mismatches to avoid dropping static IPs

Summary by Sourcery

Bug Fixes:

  • Include BackupServer mode in the static IP mismatch check to ensure watchdog recovers lost addresses

@sourcery-ai
Copy link

sourcery-ai bot commented Oct 30, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Extended config_mismatch logic to include BackupServer mode alongside Server and Unmanaged, ensuring static backup-server addresses are properly detected and recovered.

Class diagram for updated AddressMode handling in config_mismatch

classDiagram
    class AddressMode {
        <<enumeration>>
        Client
        Server
        BackupServer
        Unmanaged
    }
    class NetworkInterface {
        addresses: List<Address>
        name: str
    }
    class Address {
        mode: AddressMode
    }
    class Manager {
        config_mismatch(): Set<NetworkInterface>
    }
    NetworkInterface "1" -- "*" Address
    Address "1" -- "1" AddressMode
    Manager "1" -- "*" NetworkInterface
Loading

Flow diagram for updated static IP recovery logic in config_mismatch

flowchart TD
    A["Start config_mismatch()"] --> B["Iterate saved_interface.addresses"]
    B --> C{saved_address.mode}
    C -->|Client| D["Check for DHCP client address"]
    D --> E["Add to mismatches if missing"]
    C -->|Server/BackupServer/Unmanaged| F["Check if saved_address in current_interface.addresses"]
    F --> G["Add to mismatches if missing"]
    E --> H["Continue"]
    G --> H
    H --> I["Return mismatches"]
Loading

File-Level Changes

Change Details Files
Include BackupServer mode in static IP mismatch detection
  • Added AddressMode.BackupServer to the mode check list
  • Updated comment to reflect Server/BackupServer and Unmanaged grouping
core/services/cable_guy/api/manager.py

Possibly linked issues


Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@joaomariolago joaomariolago force-pushed the fix-missing-static-ip branch 2 times, most recently from 8cd7e76 to 24f71a8 Compare October 30, 2025 20:17
@joaomariolago joaomariolago changed the title core:services:cable-guy: Fix static IP being lost core:services:cable-guy: Fix static IP not recovering after lost Nov 6, 2025
* Fix case where a backup-server IP is is removed due to external
  factors and watchdog cannot recover it
@joaomariolago joaomariolago marked this pull request as ready for review November 6, 2025 11:52
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@patrickelectric patrickelectric merged commit a667a59 into bluerobotics:master Nov 6, 2025
6 checks passed
@patrickelectric patrickelectric added the move-to-stable Needs to be cherry-picked and move to stable label Nov 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

move-to-stable Needs to be cherry-picked and move to stable

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants