diff --git a/Changelog.md b/Changelog.md index 923e588..bccdd54 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,12 +2,6 @@ ## [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/netbox_pve_sync/__init__.py b/netbox_pve_sync/__init__.py index 2a2c2bd..7117fe2 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=_get_virtual_machine_vcpus(pve_virtual_machine_config), + vcpus=pve_virtual_machine_config['cores'], 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 = _get_virtual_machine_vcpus(pve_virtual_machine_config) + nb_virtual_machine.vcpus = pve_virtual_machine_config['cores'] 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,13 +401,6 @@ 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 diff --git a/pyproject.toml b/pyproject.toml index 6266659..c014f62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "netbox-pve-sync" -version = "0.2.4" +version = "0.2.3" authors = [ { name = "Aloïs Micard", email = "alois@micard.lu" }, ]