From c311d316ce8c049f7cf30d86ac229e9da796c39f Mon Sep 17 00:00:00 2001 From: "Marcus V." <mvrp21@inf.ufpr.br> Date: Wed, 26 Feb 2025 15:13:20 -0300 Subject: [PATCH] fix: network interfaces other than virtio cause error Signed-off-by: Marcus V. <mvrp21@inf.ufpr.br> --- netbox_proxmox_sync/__init__.py | 2 +- netbox_proxmox_sync/api/utils/models.py | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox_proxmox_sync/__init__.py b/netbox_proxmox_sync/__init__.py index fc9dad4..d44f74a 100644 --- a/netbox_proxmox_sync/__init__.py +++ b/netbox_proxmox_sync/__init__.py @@ -5,7 +5,7 @@ class NetBoxProxmoxSyncConfig(PluginConfig): name = 'netbox_proxmox_sync' verbose_name = 'NetBox Proxmox Sync' description = 'Import cluster information from Proxmox into NetBox' - version = '2.0.5' + version = '2.1.1' base_url = 'netbox-proxmox-sync' diff --git a/netbox_proxmox_sync/api/utils/models.py b/netbox_proxmox_sync/api/utils/models.py index 5b1139f..5974e7e 100644 --- a/netbox_proxmox_sync/api/utils/models.py +++ b/netbox_proxmox_sync/api/utils/models.py @@ -153,8 +153,8 @@ def vm_from_proxmox(cluster_name, proxmox_node_name, proxmox_vm, tags=[]): def interface_from_proxmox(proxmox_vm_name, interface_name, proxmox_interface): - # net[0-9]+: 'virtio=00:00:00:00:00:00,bridge=vmbr<VID>' - mac = proxmox_interface.split('virtio=')[1].split(',')[0] + # net[0-9]+: 'virtio?=00:00:00:00:00:00,bridge=vmbr<VID>' + mac = proxmox_interface.split('=')[1].split(',')[0] vlan_id = int(proxmox_interface.split('bridge=vmbr')[1].split(',firewall')[0]) return VirtualInterface( name=f'{proxmox_vm_name}:{interface_name}', diff --git a/setup.py b/setup.py index 9a30b6f..d60733d 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import find_packages, setup setup( name='netbox-proxmox-sync', - version='2.1.0', + version='2.1.1', description='Import Proxmox cluster info into NetBox.', install_requires=['pynetbox', 'proxmoxer'], include_package_data=True, -- GitLab