mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Proxmox inventory filters (#4352)
* Proxmox inventory plugin - Initial implementation of filters * This is an attempt at implementing something that would satisfy issue #3553 * A rather massive code rewrite was needed as adding the host to the inventory, setting its variables and adding it to various groups used to be done as soon as the information became available. This is not possible when it is not known whether the host should be added to the inventory before all data has been gathered. * The code for both LXC containers and Qemu VMs was refactored into a single loop. * Helper functions to generate group and fact names were added. * Proxmox inventory plugin - Warnings for filter errors * When an error occurs while compositing a filter's value and strict mode is disabled, display a warning. * Proxmox inventory plugin - Fixed pool groups building * Hosts that were excluded by the host filters were still being added to pool groups, causing errors. * Proxmox inventory plugin - Refactoring * Split off the VM/container handling code from the `_populate()` method * Split off pool group attribution from the `_populate()` method * Proxmox inventory filters - Changelog fragment * proxmox inventory - Simplify _can_add_host() method Co-authored-by: Felix Fontein <felix@fontein.de> Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
85925eabea
commit
761171b532
3 changed files with 150 additions and 124 deletions
4
changelogs/fragments/4352-proxmox-inventory-filters.yml
Normal file
4
changelogs/fragments/4352-proxmox-inventory-filters.yml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
minor_changes:
|
||||||
|
- proxmox inventory plugin - add support for client-side jinja filters
|
||||||
|
(https://github.com/ansible-collections/community.general/issues/3553).
|
|
@ -77,6 +77,12 @@ DOCUMENTATION = '''
|
||||||
- When set to C(true) (default), will use the first available interface. This can be different from what you expect.
|
- When set to C(true) (default), will use the first available interface. This can be different from what you expect.
|
||||||
default: true
|
default: true
|
||||||
type: bool
|
type: bool
|
||||||
|
filters:
|
||||||
|
version_added: 4.6.0
|
||||||
|
description: A list of Jinja templates that allow filtering hosts.
|
||||||
|
type: list
|
||||||
|
elements: str
|
||||||
|
default: []
|
||||||
strict:
|
strict:
|
||||||
version_added: 2.5.0
|
version_added: 2.5.0
|
||||||
compose:
|
compose:
|
||||||
|
@ -132,13 +138,16 @@ compose:
|
||||||
"my_var_2_value"
|
"my_var_2_value"
|
||||||
'''
|
'''
|
||||||
|
|
||||||
|
import itertools
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from ansible.module_utils.common._collections_compat import MutableMapping
|
from ansible.module_utils.common._collections_compat import MutableMapping
|
||||||
|
|
||||||
from ansible.errors import AnsibleError
|
from ansible.errors import AnsibleError
|
||||||
from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
|
from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
|
||||||
|
from ansible.module_utils.common.text.converters import to_native
|
||||||
from ansible.module_utils.six.moves.urllib.parse import urlencode
|
from ansible.module_utils.six.moves.urllib.parse import urlencode
|
||||||
|
from ansible.utils.display import Display
|
||||||
|
|
||||||
from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
|
from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
|
||||||
|
|
||||||
|
@ -151,6 +160,8 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
HAS_REQUESTS = False
|
HAS_REQUESTS = False
|
||||||
|
|
||||||
|
display = Display()
|
||||||
|
|
||||||
|
|
||||||
class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
''' Host inventory parser for ansible using Proxmox as source. '''
|
''' Host inventory parser for ansible using Proxmox as source. '''
|
||||||
|
@ -291,28 +302,19 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def _get_vm_config(self, node, vmid, vmtype, name):
|
def _get_vm_config(self, properties, node, vmid, vmtype, name):
|
||||||
ret = self._get_json("%s/api2/json/nodes/%s/%s/%s/config" % (self.proxmox_url, node, vmtype, vmid))
|
ret = self._get_json("%s/api2/json/nodes/%s/%s/%s/config" % (self.proxmox_url, node, vmtype, vmid))
|
||||||
|
|
||||||
node_key = 'node'
|
properties[self._fact('node')] = node
|
||||||
node_key = self.to_safe('%s%s' % (self.get_option('facts_prefix'), node_key.lower()))
|
properties[self._fact('vmid')] = vmid
|
||||||
self.inventory.set_variable(name, node_key, node)
|
properties[self._fact('vmtype')] = vmtype
|
||||||
|
|
||||||
vmid_key = 'vmid'
|
|
||||||
vmid_key = self.to_safe('%s%s' % (self.get_option('facts_prefix'), vmid_key.lower()))
|
|
||||||
self.inventory.set_variable(name, vmid_key, vmid)
|
|
||||||
|
|
||||||
vmtype_key = 'vmtype'
|
|
||||||
vmtype_key = self.to_safe('%s%s' % (self.get_option('facts_prefix'), vmtype_key.lower()))
|
|
||||||
self.inventory.set_variable(name, vmtype_key, vmtype)
|
|
||||||
|
|
||||||
plaintext_configs = [
|
plaintext_configs = [
|
||||||
'tags',
|
'tags',
|
||||||
]
|
]
|
||||||
|
|
||||||
for config in ret:
|
for config in ret:
|
||||||
key = config
|
key = self._fact(config)
|
||||||
key = self.to_safe('%s%s' % (self.get_option('facts_prefix'), key.lower()))
|
|
||||||
value = ret[config]
|
value = ret[config]
|
||||||
try:
|
try:
|
||||||
# fixup disk images as they have no key
|
# fixup disk images as they have no key
|
||||||
|
@ -322,16 +324,15 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
# Additional field containing parsed tags as list
|
# Additional field containing parsed tags as list
|
||||||
if config == 'tags':
|
if config == 'tags':
|
||||||
parsed_key = self.to_safe('%s%s' % (key, "_parsed"))
|
parsed_key = self.to_safe('%s%s' % (key, "_parsed"))
|
||||||
parsed_value = [tag.strip() for tag in value.split(",")]
|
properties[parsed_key] = [tag.strip() for tag in value.split(",")]
|
||||||
self.inventory.set_variable(name, parsed_key, parsed_value)
|
|
||||||
|
|
||||||
# The first field in the agent string tells you whether the agent is enabled
|
# The first field in the agent string tells you whether the agent is enabled
|
||||||
# the rest of the comma separated string is extra config for the agent
|
# the rest of the comma separated string is extra config for the agent
|
||||||
if config == 'agent' and int(value.split(',')[0]):
|
if config == 'agent' and int(value.split(',')[0]):
|
||||||
agent_iface_key = self.to_safe('%s%s' % (key, "_interfaces"))
|
|
||||||
agent_iface_value = self._get_agent_network_interfaces(node, vmid, vmtype)
|
agent_iface_value = self._get_agent_network_interfaces(node, vmid, vmtype)
|
||||||
if agent_iface_value:
|
if agent_iface_value:
|
||||||
self.inventory.set_variable(name, agent_iface_key, agent_iface_value)
|
agent_iface_key = self.to_safe('%s%s' % (key, "_interfaces"))
|
||||||
|
properties[agent_iface_key] = agent_iface_value
|
||||||
|
|
||||||
if not (isinstance(value, int) or ',' not in value):
|
if not (isinstance(value, int) or ',' not in value):
|
||||||
# split off strings with commas to a dict
|
# split off strings with commas to a dict
|
||||||
|
@ -341,26 +342,18 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
except Exception:
|
except Exception:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
self.inventory.set_variable(name, key, value)
|
properties[key] = value
|
||||||
except NameError:
|
except NameError:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def _get_vm_status(self, node, vmid, vmtype, name):
|
def _get_vm_status(self, properties, node, vmid, vmtype, name):
|
||||||
ret = self._get_json("%s/api2/json/nodes/%s/%s/%s/status/current" % (self.proxmox_url, node, vmtype, vmid))
|
ret = self._get_json("%s/api2/json/nodes/%s/%s/%s/status/current" % (self.proxmox_url, node, vmtype, vmid))
|
||||||
|
properties[self._fact('status')] = ret['status']
|
||||||
|
|
||||||
status = ret['status']
|
def _get_vm_snapshots(self, properties, node, vmid, vmtype, name):
|
||||||
status_key = 'status'
|
|
||||||
status_key = self.to_safe('%s%s' % (self.get_option('facts_prefix'), status_key.lower()))
|
|
||||||
self.inventory.set_variable(name, status_key, status)
|
|
||||||
|
|
||||||
def _get_vm_snapshots(self, node, vmid, vmtype, name):
|
|
||||||
ret = self._get_json("%s/api2/json/nodes/%s/%s/%s/snapshot" % (self.proxmox_url, node, vmtype, vmid))
|
ret = self._get_json("%s/api2/json/nodes/%s/%s/%s/snapshot" % (self.proxmox_url, node, vmtype, vmid))
|
||||||
|
|
||||||
snapshots_key = 'snapshots'
|
|
||||||
snapshots_key = self.to_safe('%s%s' % (self.get_option('facts_prefix'), snapshots_key.lower()))
|
|
||||||
|
|
||||||
snapshots = [snapshot['name'] for snapshot in ret if snapshot['name'] != 'current']
|
snapshots = [snapshot['name'] for snapshot in ret if snapshot['name'] != 'current']
|
||||||
self.inventory.set_variable(name, snapshots_key, snapshots)
|
properties[self._fact('snapshots')] = snapshots
|
||||||
|
|
||||||
def to_safe(self, word):
|
def to_safe(self, word):
|
||||||
'''Converts 'bad' characters in a string to underscores so they can be used as Ansible groups
|
'''Converts 'bad' characters in a string to underscores so they can be used as Ansible groups
|
||||||
|
@ -370,39 +363,104 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
regex = r"[^A-Za-z0-9\_]"
|
regex = r"[^A-Za-z0-9\_]"
|
||||||
return re.sub(regex, "_", word.replace(" ", ""))
|
return re.sub(regex, "_", word.replace(" ", ""))
|
||||||
|
|
||||||
def _apply_constructable(self, name, variables):
|
def _fact(self, name):
|
||||||
strict = self.get_option('strict')
|
'''Generate a fact's full name from the common prefix and a name.'''
|
||||||
self._add_host_to_composed_groups(self.get_option('groups'), variables, name, strict=strict)
|
return self.to_safe('%s%s' % (self.facts_prefix, name.lower()))
|
||||||
self._add_host_to_keyed_groups(self.get_option('keyed_groups'), variables, name, strict=strict)
|
|
||||||
self._set_composite_vars(self.get_option('compose'), variables, name, strict=strict)
|
def _group(self, name):
|
||||||
|
'''Generate a group's full name from the common prefix and a name.'''
|
||||||
|
return self.to_safe('%s%s' % (self.group_prefix, name.lower()))
|
||||||
|
|
||||||
|
def _can_add_host(self, name, properties):
|
||||||
|
'''Ensure that a host satisfies all defined hosts filters. If strict mode is
|
||||||
|
enabled, any error during host filter compositing will lead to an AnsibleError
|
||||||
|
being raised, otherwise the filter will be ignored.
|
||||||
|
'''
|
||||||
|
for host_filter in self.host_filters:
|
||||||
|
try:
|
||||||
|
if not self._compose(host_filter, properties):
|
||||||
|
return False
|
||||||
|
except Exception as e: # pylint: disable=broad-except
|
||||||
|
message = "Could not evaluate host filter %s for host %s - %s" % (host_filter, name, to_native(e))
|
||||||
|
if self.strict:
|
||||||
|
raise AnsibleError(message)
|
||||||
|
display.warning(message)
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _add_host(self, name, variables):
|
||||||
|
self.inventory.add_host(name)
|
||||||
|
for k, v in variables.items():
|
||||||
|
self.inventory.set_variable(name, k, v)
|
||||||
|
variables = self.inventory.get_host(name).get_vars()
|
||||||
|
self._set_composite_vars(self.get_option('compose'), variables, name, strict=self.strict)
|
||||||
|
self._add_host_to_composed_groups(self.get_option('groups'), variables, name, strict=self.strict)
|
||||||
|
self._add_host_to_keyed_groups(self.get_option('keyed_groups'), variables, name, strict=self.strict)
|
||||||
|
|
||||||
|
def _handle_item(self, node, ittype, item):
|
||||||
|
'''Handle an item from the list of LXC containers and Qemu VM. The
|
||||||
|
return value will be either None if the item was skipped or the name of
|
||||||
|
the item if it was added to the inventory.'''
|
||||||
|
if item.get('template'):
|
||||||
|
return None
|
||||||
|
|
||||||
|
properties = dict()
|
||||||
|
name, vmid = item['name'], item['vmid']
|
||||||
|
|
||||||
|
# get status, config and snapshots if want_facts == True
|
||||||
|
if self.get_option('want_facts'):
|
||||||
|
self._get_vm_status(properties, node, vmid, ittype, name)
|
||||||
|
self._get_vm_config(properties, node, vmid, ittype, name)
|
||||||
|
self._get_vm_snapshots(properties, node, vmid, ittype, name)
|
||||||
|
|
||||||
|
# ensure the host satisfies filters
|
||||||
|
if not self._can_add_host(name, properties):
|
||||||
|
return None
|
||||||
|
|
||||||
|
# add the host to the inventory
|
||||||
|
self._add_host(name, properties)
|
||||||
|
node_type_group = self._group('%s_%s' % (node, ittype))
|
||||||
|
self.inventory.add_child(self._group('all_' + ittype), name)
|
||||||
|
self.inventory.add_child(node_type_group, name)
|
||||||
|
if item['status'] == 'stopped':
|
||||||
|
self.inventory.add_child(self._group('all_stopped'), name)
|
||||||
|
elif item['status'] == 'running':
|
||||||
|
self.inventory.add_child(self._group('all_running'), name)
|
||||||
|
|
||||||
|
return name
|
||||||
|
|
||||||
|
def _populate_pool_groups(self, added_hosts):
|
||||||
|
'''Generate groups from Proxmox resource pools, ignoring VMs and
|
||||||
|
containers that were skipped.'''
|
||||||
|
for pool in self._get_pools():
|
||||||
|
poolid = pool.get('poolid')
|
||||||
|
if not poolid:
|
||||||
|
continue
|
||||||
|
pool_group = self._group('pool_' + poolid)
|
||||||
|
self.inventory.add_group(pool_group)
|
||||||
|
|
||||||
|
for member in self._get_members_per_pool(poolid):
|
||||||
|
name = member.get('name')
|
||||||
|
if name and name in added_hosts:
|
||||||
|
self.inventory.add_child(pool_group, name)
|
||||||
|
|
||||||
def _populate(self):
|
def _populate(self):
|
||||||
|
|
||||||
self._get_auth()
|
# create common groups
|
||||||
|
self.inventory.add_group(self._group('all_lxc'))
|
||||||
|
self.inventory.add_group(self._group('all_qemu'))
|
||||||
|
self.inventory.add_group(self._group('all_running'))
|
||||||
|
self.inventory.add_group(self._group('all_stopped'))
|
||||||
|
nodes_group = self._group('nodes')
|
||||||
|
self.inventory.add_group(nodes_group)
|
||||||
|
|
||||||
# gather vm's on nodes
|
# gather vm's on nodes
|
||||||
|
self._get_auth()
|
||||||
|
hosts = []
|
||||||
for node in self._get_nodes():
|
for node in self._get_nodes():
|
||||||
# FIXME: this can probably be cleaner
|
if not node.get('node'):
|
||||||
# create groups
|
continue
|
||||||
lxc_group = 'all_lxc'
|
|
||||||
lxc_group = self.to_safe('%s%s' % (self.get_option('group_prefix'), lxc_group.lower()))
|
|
||||||
self.inventory.add_group(lxc_group)
|
|
||||||
qemu_group = 'all_qemu'
|
|
||||||
qemu_group = self.to_safe('%s%s' % (self.get_option('group_prefix'), qemu_group.lower()))
|
|
||||||
self.inventory.add_group(qemu_group)
|
|
||||||
nodes_group = 'nodes'
|
|
||||||
nodes_group = self.to_safe('%s%s' % (self.get_option('group_prefix'), nodes_group.lower()))
|
|
||||||
self.inventory.add_group(nodes_group)
|
|
||||||
running_group = 'all_running'
|
|
||||||
running_group = self.to_safe('%s%s' % (self.get_option('group_prefix'), running_group.lower()))
|
|
||||||
self.inventory.add_group(running_group)
|
|
||||||
stopped_group = 'all_stopped'
|
|
||||||
stopped_group = self.to_safe('%s%s' % (self.get_option('group_prefix'), stopped_group.lower()))
|
|
||||||
self.inventory.add_group(stopped_group)
|
|
||||||
|
|
||||||
if node.get('node'):
|
|
||||||
self.inventory.add_host(node['node'])
|
self.inventory.add_host(node['node'])
|
||||||
|
|
||||||
if node['type'] == 'node':
|
if node['type'] == 'node':
|
||||||
self.inventory.add_child(nodes_group, node['node'])
|
self.inventory.add_child(nodes_group, node['node'])
|
||||||
|
|
||||||
|
@ -414,65 +472,21 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
ip = self._get_node_ip(node['node'])
|
ip = self._get_node_ip(node['node'])
|
||||||
self.inventory.set_variable(node['node'], 'ansible_host', ip)
|
self.inventory.set_variable(node['node'], 'ansible_host', ip)
|
||||||
|
|
||||||
# get LXC containers for this node
|
# add LXC/Qemu groups for the node
|
||||||
node_lxc_group = self.to_safe('%s%s' % (self.get_option('group_prefix'), ('%s_lxc' % node['node']).lower()))
|
for ittype in ('lxc', 'qemu'):
|
||||||
self.inventory.add_group(node_lxc_group)
|
node_type_group = self._group('%s_%s' % (node['node'], ittype))
|
||||||
for lxc in self._get_lxc_per_node(node['node']):
|
self.inventory.add_group(node_type_group)
|
||||||
self.inventory.add_host(lxc['name'])
|
|
||||||
self.inventory.add_child(lxc_group, lxc['name'])
|
|
||||||
self.inventory.add_child(node_lxc_group, lxc['name'])
|
|
||||||
|
|
||||||
# get LXC status when want_facts == True
|
# get LXC containers and Qemu VMs for this node
|
||||||
if self.get_option('want_facts'):
|
lxc_objects = zip(itertools.repeat('lxc'), self._get_lxc_per_node(node['node']))
|
||||||
self._get_vm_status(node['node'], lxc['vmid'], 'lxc', lxc['name'])
|
qemu_objects = zip(itertools.repeat('qemu'), self._get_qemu_per_node(node['node']))
|
||||||
if lxc['status'] == 'stopped':
|
for ittype, item in itertools.chain(lxc_objects, qemu_objects):
|
||||||
self.inventory.add_child(stopped_group, lxc['name'])
|
name = self._handle_item(node['node'], ittype, item)
|
||||||
elif lxc['status'] == 'running':
|
if name is not None:
|
||||||
self.inventory.add_child(running_group, lxc['name'])
|
hosts.append(name)
|
||||||
|
|
||||||
# get LXC config and snapshots for facts
|
|
||||||
if self.get_option('want_facts'):
|
|
||||||
self._get_vm_config(node['node'], lxc['vmid'], 'lxc', lxc['name'])
|
|
||||||
self._get_vm_snapshots(node['node'], lxc['vmid'], 'lxc', lxc['name'])
|
|
||||||
|
|
||||||
self._apply_constructable(lxc["name"], self.inventory.get_host(lxc['name']).get_vars())
|
|
||||||
|
|
||||||
# get QEMU vm's for this node
|
|
||||||
node_qemu_group = self.to_safe('%s%s' % (self.get_option('group_prefix'), ('%s_qemu' % node['node']).lower()))
|
|
||||||
self.inventory.add_group(node_qemu_group)
|
|
||||||
for qemu in self._get_qemu_per_node(node['node']):
|
|
||||||
if qemu.get('template'):
|
|
||||||
continue
|
|
||||||
|
|
||||||
self.inventory.add_host(qemu['name'])
|
|
||||||
self.inventory.add_child(qemu_group, qemu['name'])
|
|
||||||
self.inventory.add_child(node_qemu_group, qemu['name'])
|
|
||||||
|
|
||||||
# get QEMU status
|
|
||||||
self._get_vm_status(node['node'], qemu['vmid'], 'qemu', qemu['name'])
|
|
||||||
if qemu['status'] == 'stopped':
|
|
||||||
self.inventory.add_child(stopped_group, qemu['name'])
|
|
||||||
elif qemu['status'] == 'running':
|
|
||||||
self.inventory.add_child(running_group, qemu['name'])
|
|
||||||
|
|
||||||
# get QEMU config and snapshots for facts
|
|
||||||
if self.get_option('want_facts'):
|
|
||||||
self._get_vm_config(node['node'], qemu['vmid'], 'qemu', qemu['name'])
|
|
||||||
self._get_vm_snapshots(node['node'], qemu['vmid'], 'qemu', qemu['name'])
|
|
||||||
|
|
||||||
self._apply_constructable(qemu["name"], self.inventory.get_host(qemu['name']).get_vars())
|
|
||||||
|
|
||||||
# gather vm's in pools
|
# gather vm's in pools
|
||||||
for pool in self._get_pools():
|
self._populate_pool_groups(hosts)
|
||||||
if pool.get('poolid'):
|
|
||||||
pool_group = 'pool_' + pool['poolid']
|
|
||||||
pool_group = self.to_safe('%s%s' % (self.get_option('group_prefix'), pool_group.lower()))
|
|
||||||
self.inventory.add_group(pool_group)
|
|
||||||
|
|
||||||
for member in self._get_members_per_pool(pool['poolid']):
|
|
||||||
if member.get('name'):
|
|
||||||
if not member.get('template'):
|
|
||||||
self.inventory.add_child(pool_group, member['name'])
|
|
||||||
|
|
||||||
def parse(self, inventory, loader, path, cache=True):
|
def parse(self, inventory, loader, path, cache=True):
|
||||||
if not HAS_REQUESTS:
|
if not HAS_REQUESTS:
|
||||||
|
@ -484,12 +498,16 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
# read config from file, this sets 'options'
|
# read config from file, this sets 'options'
|
||||||
self._read_config_data(path)
|
self._read_config_data(path)
|
||||||
|
|
||||||
# get connection host
|
# read options
|
||||||
self.proxmox_url = self.get_option('url').rstrip('/')
|
self.proxmox_url = self.get_option('url').rstrip('/')
|
||||||
self.proxmox_user = self.get_option('user')
|
self.proxmox_user = self.get_option('user')
|
||||||
self.proxmox_password = self.get_option('password')
|
self.proxmox_password = self.get_option('password')
|
||||||
self.cache_key = self.get_cache_key(path)
|
self.cache_key = self.get_cache_key(path)
|
||||||
self.use_cache = cache and self.get_option('cache')
|
self.use_cache = cache and self.get_option('cache')
|
||||||
|
self.host_filters = self.get_option('filters')
|
||||||
|
self.group_prefix = self.get_option('group_prefix')
|
||||||
|
self.facts_prefix = self.get_option('facts_prefix')
|
||||||
|
self.strict = self.get_option('strict')
|
||||||
|
|
||||||
# actually populate inventory
|
# actually populate inventory
|
||||||
self._populate()
|
self._populate()
|
||||||
|
|
|
@ -522,7 +522,7 @@ def get_json(url):
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def get_vm_snapshots(node, vmtype, vmid, name):
|
def get_vm_snapshots(node, properties, vmtype, vmid, name):
|
||||||
return [
|
return [
|
||||||
{"description": "",
|
{"description": "",
|
||||||
"name": "clean",
|
"name": "clean",
|
||||||
|
@ -537,7 +537,7 @@ def get_vm_snapshots(node, vmtype, vmid, name):
|
||||||
}]
|
}]
|
||||||
|
|
||||||
|
|
||||||
def get_vm_status(node, vmtype, vmid, name):
|
def get_vm_status(properties, node, vmtype, vmid, name):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -559,6 +559,9 @@ def test_populate(inventory, mocker):
|
||||||
inventory.proxmox_user = 'root@pam'
|
inventory.proxmox_user = 'root@pam'
|
||||||
inventory.proxmox_password = 'password'
|
inventory.proxmox_password = 'password'
|
||||||
inventory.proxmox_url = 'https://localhost:8006'
|
inventory.proxmox_url = 'https://localhost:8006'
|
||||||
|
inventory.group_prefix = 'proxmox_'
|
||||||
|
inventory.facts_prefix = 'proxmox_'
|
||||||
|
inventory.strict = False
|
||||||
|
|
||||||
# bypass authentication and API fetch calls
|
# bypass authentication and API fetch calls
|
||||||
inventory._get_auth = mocker.MagicMock(side_effect=get_auth)
|
inventory._get_auth = mocker.MagicMock(side_effect=get_auth)
|
||||||
|
@ -566,6 +569,7 @@ def test_populate(inventory, mocker):
|
||||||
inventory._get_vm_status = mocker.MagicMock(side_effect=get_vm_status)
|
inventory._get_vm_status = mocker.MagicMock(side_effect=get_vm_status)
|
||||||
inventory._get_vm_snapshots = mocker.MagicMock(side_effect=get_vm_snapshots)
|
inventory._get_vm_snapshots = mocker.MagicMock(side_effect=get_vm_snapshots)
|
||||||
inventory.get_option = mocker.MagicMock(side_effect=get_option)
|
inventory.get_option = mocker.MagicMock(side_effect=get_option)
|
||||||
|
inventory._can_add_host = mocker.MagicMock(return_value=True)
|
||||||
inventory._populate()
|
inventory._populate()
|
||||||
|
|
||||||
# get different hosts
|
# get different hosts
|
||||||
|
|
Loading…
Reference in a new issue