Skip to content

opennebula inventory: add VM ID and VM host to data #8532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Oct 7, 2024
Merged

opennebula inventory: add VM ID and VM host to data #8532

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4223624
Add VM id and VM host to opennebula inventory data
aioue Jun 17, 2024
c1bf442
Create 8532-expand-opennuebula-inventory-data.yml
aioue Jun 17, 2024
056206e
Update opennebula.py
aioue Jul 2, 2024
4b4505e
Update changelogs/fragments/8532-expand-opennuebula-inventory-data.yml
aioue Jul 17, 2024
c7e7b6c
Add check for empty records and add test
aioue Aug 21, 2024
edcb27b
fix attribute test
aioue Aug 21, 2024
b6b512f
fix attribute test
aioue Aug 21, 2024
8717849
fix attribute test
aioue Aug 21, 2024
be1fdff
fix attribute test
aioue Aug 21, 2024
92fb4f1
Update plugins/inventory/opennebula.py
aioue Aug 21, 2024
c66aea5
update as per guidance
aioue Aug 21, 2024
70284e4
restore attribute checks
aioue Aug 27, 2024
4e9a270
fix attr
aioue Aug 27, 2024
3211962
fix indent
aioue Aug 27, 2024
aa3d2d7
PR Fixes
abakanovskii Oct 1, 2024
cddfe3c
add attribute check in case of empty variable
aioue Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/8532-expand-opennuebula-inventory-data.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- opennebula.py - add VM ``id`` and VM ``host`` to inventory host data (https://github.com/ansible-collections/community.general/pull/8532).
3 changes: 3 additions & 0 deletions plugins/inventory/opennebula.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ def _retrieve_servers(self, label_filter=None):
continue

server['name'] = vm.NAME
server['id'] = vm.ID
if hasattr(vm.HISTORY_RECORDS, 'HISTORY'):
server['host'] = vm.HISTORY_RECORDS.HISTORY[-1].HOSTNAME
server['LABELS'] = labels
server['v4_first_ip'] = self._get_vm_ipv4(vm)
server['v6_first_ip'] = self._get_vm_ipv6(vm)
Expand Down
23 changes: 20 additions & 3 deletions tests/unit/plugins/inventory/test_opennebula.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,23 @@
from ansible_collections.community.general.tests.unit.compat.mock import create_autospec


class HistoryEntry(object):
def __init__(self):
self.SEQ = '384'
self.HOSTNAME = 'sam-691-sam'
self.HID = '10'
self.CID = '0'
self.DS_ID = '100'
self.VM_MAD = 'kvm'
self.TM_MAD = '3par'
self.ACTION = '0'


class HistoryRecords(object):
def __init__(self):
self.HISTORY = [HistoryEntry()]


@pytest.fixture
def inventory():
r = InventoryModule()
Expand Down Expand Up @@ -58,7 +75,7 @@ def get_vm_pool():
'ETIME': 0,
'GID': 132,
'GNAME': 'CSApparelVDC',
'HISTORY_RECORDS': {},
'HISTORY_RECORDS': HistoryRecords(),
'ID': 7157,
'LAST_POLL': 1632762935,
'LCM_STATE': 3,
Expand Down Expand Up @@ -104,7 +121,7 @@ def get_vm_pool():
'ETIME': 0,
'GID': 0,
'GNAME': 'oneadmin',
'HISTORY_RECORDS': {},
'HISTORY_RECORDS': [],
'ID': 327,
'LAST_POLL': 1632763543,
'LCM_STATE': 3,
Expand Down Expand Up @@ -167,7 +184,7 @@ def get_vm_pool():
'ETIME': 0,
'GID': 0,
'GNAME': 'oneadmin',
'HISTORY_RECORDS': {},
'HISTORY_RECORDS': [],
'ID': 107,
'LAST_POLL': 1632764186,
'LCM_STATE': 3,
Expand Down