Compare commits

...

2 commits

Author SHA1 Message Date
6470348875 Release 0.2.4
All checks were successful
CD / ci (push) Successful in 33s
CI / ci (push) Successful in 27s
2025-09-02 23:57:53 +02:00
49bc0cd3bc [PATCH] Import vCPU core count instead of total available cores
See: https://github.com/creekorful/netbox-pve-sync/pull/10
2025-09-02 23:57:08 +02:00
3 changed files with 16 additions and 3 deletions

View file

@ -2,6 +2,12 @@
## [Unreleased] ## [Unreleased]
## [0.2.4] - 02/09/2025
### Fixed
- Import vCPU core count instead of total available cores.
## [0.2.3] - 26/08/2025 ## [0.2.3] - 26/08/2025
### Fixed ### Fixed

View file

@ -130,7 +130,7 @@ def _process_pve_virtual_machine(
site=_nb_device.site.id, site=_nb_device.site.id,
cluster=os.environ.get('NB_CLUSTER_ID', 1), cluster=os.environ.get('NB_CLUSTER_ID', 1),
device=_nb_device.id, 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']), memory=int(pve_virtual_machine_config['memory']),
status='active' if _pve_virtual_machine['status'] == 'running' else 'offline', 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)), 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.site = _nb_device.site.id
nb_virtual_machine.cluster = os.environ.get('NB_CLUSTER_ID', 1) nb_virtual_machine.cluster = os.environ.get('NB_CLUSTER_ID', 1)
nb_virtual_machine.device = _nb_device.id 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.memory = int(pve_virtual_machine_config['memory'])
nb_virtual_machine.status = 'active' if _pve_virtual_machine['status'] == 'running' else 'offline' 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)) 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 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(): def main():
""" """
netbox-pve-sync main entrypoint netbox-pve-sync main entrypoint

View file

@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "netbox-pve-sync" name = "netbox-pve-sync"
version = "0.2.3" version = "0.2.4"
authors = [ authors = [
{ name = "Aloïs Micard", email = "alois@micard.lu" }, { name = "Aloïs Micard", email = "alois@micard.lu" },
] ]