From 49bc0cd3bc77897118104290c8c42cf70198888c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alo=C3=AFs=20Micard?= Date: Tue, 2 Sep 2025 23:56:34 +0200 Subject: [PATCH 1/2] [PATCH] Import vCPU core count instead of total available cores See: https://github.com/creekorful/netbox-pve-sync/pull/10 --- netbox_pve_sync/__init__.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/netbox_pve_sync/__init__.py b/netbox_pve_sync/__init__.py index 7117fe2..2a2c2bd 100644 --- a/netbox_pve_sync/__init__.py +++ b/netbox_pve_sync/__init__.py @@ -130,7 +130,7 @@ def _process_pve_virtual_machine( site=_nb_device.site.id, cluster=os.environ.get('NB_CLUSTER_ID', 1), device=_nb_device.id, - vcpus=pve_virtual_machine_config['cores'], + vcpus=_get_virtual_machine_vcpus(pve_virtual_machine_config), memory=int(pve_virtual_machine_config['memory']), status='active' if _pve_virtual_machine['status'] == 'running' else 'offline', tags=list(map(lambda _pve_tag_name: _nb_objects['tags'][_pve_tag_name].id, _pve_tags)), @@ -145,7 +145,7 @@ def _process_pve_virtual_machine( nb_virtual_machine.site = _nb_device.site.id nb_virtual_machine.cluster = os.environ.get('NB_CLUSTER_ID', 1) nb_virtual_machine.device = _nb_device.id - nb_virtual_machine.vcpus = pve_virtual_machine_config['cores'] + nb_virtual_machine.vcpus = _get_virtual_machine_vcpus(pve_virtual_machine_config) nb_virtual_machine.memory = int(pve_virtual_machine_config['memory']) nb_virtual_machine.status = 'active' if _pve_virtual_machine['status'] == 'running' else 'offline' nb_virtual_machine.tags = list(map(lambda _pve_tag_name: _nb_objects['tags'][_pve_tag_name].id, _pve_tags)) @@ -401,6 +401,13 @@ def _process_pve_disk_size(_raw_disk_size: str) -> int: return -1 +def _get_virtual_machine_vcpus(_pve_virtual_machine_config: dict) -> int: + if 'vcpus' in _pve_virtual_machine_config: + return _pve_virtual_machine_config['vcpus'] + + return _pve_virtual_machine_config['cores'] * _pve_virtual_machine_config['sockets'] + + def main(): """ netbox-pve-sync main entrypoint From 647034887510dcc86136c86080b606429559d862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alo=C3=AFs=20Micard?= Date: Tue, 2 Sep 2025 23:57:53 +0200 Subject: [PATCH 2/2] Release 0.2.4 --- Changelog.md | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index bccdd54..923e588 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ ## [Unreleased] +## [0.2.4] - 02/09/2025 + +### Fixed + +- Import vCPU core count instead of total available cores. + ## [0.2.3] - 26/08/2025 ### Fixed diff --git a/pyproject.toml b/pyproject.toml index c014f62..6266659 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "netbox-pve-sync" -version = "0.2.3" +version = "0.2.4" authors = [ { name = "Aloïs Micard", email = "alois@micard.lu" }, ]