[PATCH] Import vCPU core count instead of total available cores
See: https://github.com/creekorful/netbox-pve-sync/pull/10
This commit is contained in:
parent
490f72071f
commit
49bc0cd3bc
1 changed files with 9 additions and 2 deletions
|
@ -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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue