accept either ["site"] or ["scope"] for duplicate site entry detection due to netbox API change

[nickhilliard]

What does this PR do?

The netbox API changed format in netbox 4.2.0 to change to a generic foreign key format. This commit allows both old and new API formats.

What issues does this PR fix or reference?

Fixes #68375

Previous Behavior

the minion pillar data failed to load with:

2025-11-10 17:33:48,613 [salt.pillar      :1228][ERROR   ][3692613] Exception caught loading ext_pillar 'netbox':
  File "/opt/saltstack/salt/lib/python3.10/site-packages/salt/pillar/__init__.py", line 1220, in ext_pillar
    ext = self._external_pillar_data(pillar, val, key)
  File "/opt/saltstack/salt/lib/python3.10/site-packages/salt/pillar/__init__.py", line 1140, in _external_pillar_data
    ext = self.ext_pillars[key](self.minion_id, pillar, **val)
  File "/opt/saltstack/salt/lib/python3.10/site-packages/salt/loader/lazy.py", line 162, in __call__
    ret = self.loader.run(run_func, *args, **kwargs)
  File "/opt/saltstack/salt/lib/python3.10/site-packages/salt/loader/lazy.py", line 1248, in run
    return self._last_context.run(self._run_as, _func_or_method, *args, **kwargs)
  File "/opt/saltstack/salt/lib/python3.10/site-packages/salt/loader/lazy.py", line 1263, in _run_as
    ret = _func_or_method(*args, **kwargs)
  File "/opt/saltstack/salt/lib/python3.10/site-packages/salt/pillar/netbox.py", line 1157, in ext_pillar
    ret["netbox"]["site"]["prefixes"] = _get_site_prefixes(
  File "/opt/saltstack/salt/lib/python3.10/site-packages/salt/pillar/netbox.py", line 1023, in _get_site_prefixes
    del site_prefixes_results[prefix_count]["site"]

New Behavior

minion pillar now loads

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

• Docs
• Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
• Tests written/updated

Commits signed with GPG?

No

[welcome]

Hi there! Welcome to the Salt Community! Thank you for making your first contribution. We have a lengthy process for issues and PRs. Someone from the Core Team will follow up as soon as possible. In the meantime, here's some information that may help as you continue your Salt journey.
Please be sure to review our Code of Conduct. Also, check out some of our community resources including:

• Salt's Contributor Guide
• Join our Community Discord
• Salt Project YouTube channel
• GitHub Discussions

There are lots of ways to get involved in our community. Every month, there are around a dozen opportunities to meet with other contributors and the Salt Core team and collaborate in real time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
If you have additional questions, email us at [email protected]. We're glad you've joined our community and look forward to doing awesome things with you!

[bdrx312]

This file is not edited manually to add change logs. See https://docs.saltproject.io/en/master/topics/development/contributing.html#changelog-and-commit for steps on adding a change log

[nickhilliard]

noted + changed.

[bdrx312]

For checking if an item is in a dictionary you just call in against the dictionary reference itself--you don't call in on .keys(): if "site" in site_prefixes_results[prefix_count]:. However you may just want to try to delete both:

site_prefixes_results[prefix_count].pop("site", None)
site_prefixes_results[prefix_count].pop("scope", None)

[nickhilliard]

noted + changed.

[twangboy]

Netbox has been removed from salt starting with the 3008 release. It is recommended that all bug fixes go into the netbox salt extension.
https://github.com/salt-extensions/saltext-netbox

[nickhilliard]

Netbox has been removed from salt starting with the 3008 release. It is recommended that all bug fixes go into the netbox salt extension. https://github.com/salt-extensions/saltext-netbox

yes, it's was removed in commit dc526dc, i.e. already not present in 3007.x. This commit is against 3006.x.

There's nothing in the saltext-netbox repo yet. If/when it appears there, I'll make sure it's ported over there.