DGNum/netbox-agent
8
0
Fork 0
Code Issues 28 Pull requests 9 Projects Releases 14 Packages Wiki Activity Actions

Fix KeyError: 'pvid' in lldp.py #223

Open
illes wants to merge 2 commits from illes/patch-1 into main
pull from: illes/patch-1
merge into: DGNum:main
Conversation 3 Commits 2 Files changed 4 +19 -2
illes commented 2022-04-26 12:25:47 +02:00 (Migrated from github.com)
Copy link
lldp.eth0.vlan.vlan-id=300
lldp.eth0.vlan.pvid=yes
lldp.eth0.vlan=VLAN300

Version: lldpd 1.0.11

Traceback (most recent call last):
  File "/root/.local/bin/netbox_agent", line 8, in <module>
    sys.exit(main())
  File "/root/.local/lib/python3.10/site-packages/netbox_agent/cli.py", line 44, in main
    return run(config)
  File "/root/.local/lib/python3.10/site-packages/netbox_agent/cli.py", line 39, in run
    server.netbox_create_or_update(config)
  File "/root/.local/lib/python3.10/site-packages/netbox_agent/server.py", line 292, in netbox_create_or_update
    self.network.create_or_update_netbox_network_cards()
  File "/root/.local/lib/python3.10/site-packages/netbox_agent/network.py", line 417, in create_or_update_netbox_network_cards
    ret, interface = self.reset_vlan_on_interface(nic, interface)
  File "/root/.local/lib/python3.10/site-packages/netbox_agent/network.py", line 234, in reset_vlan_on_interface
    pvid_vlan = [key for (key, value) in lldp_vlan.items() if value['pvid']]
  File "/root/.local/lib/python3.10/site-packages/netbox_agent/network.py", line 234, in <listcomp>
    pvid_vlan = [key for (key, value) in lldp_vlan.items() if value['pvid']]
KeyError: 'pvid'

lldp_vlan := {'300': {'pvid': True}, 'VLAN300': {}}
``` lldp.eth0.vlan.vlan-id=300 lldp.eth0.vlan.pvid=yes lldp.eth0.vlan=VLAN300 ``` ``` Version: lldpd 1.0.11 ``` ``` Traceback (most recent call last): File "/root/.local/bin/netbox_agent", line 8, in <module> sys.exit(main()) File "/root/.local/lib/python3.10/site-packages/netbox_agent/cli.py", line 44, in main return run(config) File "/root/.local/lib/python3.10/site-packages/netbox_agent/cli.py", line 39, in run server.netbox_create_or_update(config) File "/root/.local/lib/python3.10/site-packages/netbox_agent/server.py", line 292, in netbox_create_or_update self.network.create_or_update_netbox_network_cards() File "/root/.local/lib/python3.10/site-packages/netbox_agent/network.py", line 417, in create_or_update_netbox_network_cards ret, interface = self.reset_vlan_on_interface(nic, interface) File "/root/.local/lib/python3.10/site-packages/netbox_agent/network.py", line 234, in reset_vlan_on_interface pvid_vlan = [key for (key, value) in lldp_vlan.items() if value['pvid']] File "/root/.local/lib/python3.10/site-packages/netbox_agent/network.py", line 234, in <listcomp> pvid_vlan = [key for (key, value) in lldp_vlan.items() if value['pvid']] KeyError: 'pvid' ``` ``` lldp_vlan := {'300': {'pvid': True}, 'VLAN300': {}} ```
rosberen commented 2022-04-26 22:48:45 +02:00 (Migrated from github.com)
Copy link

Fix KeyError: 'pvid' in lldp.py #223
vid = value.replace('vlan-', '').replace('VLAN', '')

It still gives an error

Traceback (most recent call last):
File "/usr/lib64/python3.6/runpy.py", line 193, in _run_module_as_main
"main", mod_spec)
File "/usr/lib64/python3.6/runpy.py", line 85, in _run_code
exec(code, run_globals)
File "/opt/netbox_agent/netbox_agent/cli.py", line 54, in
main()
File "/opt/netbox_agent/netbox_agent/cli.py", line 50, in main
return run(config)
File "/opt/netbox_agent/netbox_agent/cli.py", line 43, in run
server.netbox_create_or_update(config)
File "/opt/netbox_agent/netbox_agent/server.py", line 413, in netbox_create_or_update
self.network.create_or_update_netbox_network_cards()
File "/opt/netbox_agent/netbox_agent/network.py", line 443, in create_or_update_netbox_network_cards
ret, interface = self.reset_vlan_on_interface(nic, interface)
File "/opt/netbox_agent/netbox_agent/network.py", line 248, in reset_vlan_on_interface
pvid_vlan = [key for (key, value) in lldp_vlan.items() if value['pvid']]
File "/opt/netbox_agent/netbox_agent/network.py", line 248, in
pvid_vlan = [key for (key, value) in lldp_vlan.items() if value['pvid']]
KeyError: 'pvid'

Fix KeyError: 'pvid' in lldp.py #223 vid = value.replace('vlan-', '').replace('VLAN', '') It still gives an error Traceback (most recent call last): File "/usr/lib64/python3.6/runpy.py", line 193, in _run_module_as_main "__main__", mod_spec) File "/usr/lib64/python3.6/runpy.py", line 85, in _run_code exec(code, run_globals) File "/opt/netbox_agent/netbox_agent/cli.py", line 54, in <module> main() File "/opt/netbox_agent/netbox_agent/cli.py", line 50, in main return run(config) File "/opt/netbox_agent/netbox_agent/cli.py", line 43, in run server.netbox_create_or_update(config) File "/opt/netbox_agent/netbox_agent/server.py", line 413, in netbox_create_or_update self.network.create_or_update_netbox_network_cards() File "/opt/netbox_agent/netbox_agent/network.py", line 443, in create_or_update_netbox_network_cards ret, interface = self.reset_vlan_on_interface(nic, interface) File "/opt/netbox_agent/netbox_agent/network.py", line 248, in reset_vlan_on_interface pvid_vlan = [key for (key, value) in lldp_vlan.items() if value['pvid']] File "/opt/netbox_agent/netbox_agent/network.py", line 248, in <listcomp> pvid_vlan = [key for (key, value) in lldp_vlan.items() if value['pvid']] KeyError: 'pvid'
illes commented 2022-04-29 09:43:21 +02:00 (Migrated from github.com)
Copy link

You are right that KeyError: 'pvid' can still happen, though not with the minimal example I provided. To catch that case, I added an example and tests.

You are right that `KeyError: 'pvid'` can still happen, though not with the minimal example I provided. To catch that case, I added an example and tests.
cyrinux commented 2022-11-14 10:10:29 +01:00 (Migrated from github.com)
Copy link

@illes @rosberen sorry for the delay, is this PR ready for you ?

@illes @rosberen sorry for the delay, is this PR ready for you ?
This pull request has changes conflicting with the target branch.
  • netbox_agent/lldp.py
  • netbox_agent/network.py
  • tests/network.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin illes/patch-1:illes/patch-1
git switch illes/patch-1

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff illes/patch-1
git switch illes/patch-1
git rebase main
git switch main
git merge --ff-only illes/patch-1
git switch illes/patch-1
git rebase main
git switch main
git merge --no-ff illes/patch-1
git switch main
git merge --squash illes/patch-1
git switch main
git merge --ff-only illes/patch-1
git switch main
git merge illes/patch-1
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
help wanted

Extra attention is needed

  
need testing

   
status: accepted

   
status: discussing

   
type: bug

Something isn't working

  
type: documentation

Improvements or additions to documentation

  
type: duplicate

This issue or pull request already exists

  
type: enhancement

New feature or request

  
type:hardware

Mostly new hardware

  
type: invalid

This doesn't seem right

  
type: major feature

   
type: minor feature
  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
help wanted
need testing
status: accepted
status: discussing
type: bug
type: documentation
type: duplicate
type: enhancement
type:hardware
type: invalid
type: major feature
type: minor feature
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: DGNum/netbox-agent#223
No description provided.
Delete branch "illes/patch-1"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?