cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add virtualization devices in the inventory (#45728)

Browse source
This commit is contained in:
Rémy Léone 2018-10-11 19:09:01 +02:00 committed by John R Barker
parent a8925484c9
commit faf262977e
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/ansible/plugins/inventory/netbox.py
View file

@ -105,6 +105,7 @@ import json
import uuid import uuid
from sys import version as python_version from sys import version as python_version
from threading import Thread from threading import Thread
from itertools import chain
from ansible.plugins.inventory import BaseInventoryPlugin, Constructable from ansible.plugins.inventory import BaseInventoryPlugin, Constructable
from ansible.module_utils.ansible_release import __version__ as ansible_version from ansible.module_utils.ansible_release import __version__ as ansible_version
@ -114,7 +115,6 @@ from ansible.module_utils.urls import open_url
from ansible.module_utils.six.moves.urllib.parse import urljoin, urlencode from ansible.module_utils.six.moves.urllib.parse import urljoin, urlencode
from ansible.module_utils.compat.ipaddress import ip_interface from ansible.module_utils.compat.ipaddress import ip_interface
ALLOWED_DEVICE_QUERY_PARAMETERS = ( ALLOWED_DEVICE_QUERY_PARAMETERS = (
"asset_tag", "asset_tag",
"cluster_id", "cluster_id",
@ -190,11 +190,23 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
"tenants": self.extract_tenant, "tenants": self.extract_tenant,
"racks": self.extract_rack, "racks": self.extract_rack,
"tags": self.extract_tags, "tags": self.extract_tags,
"disk": self.extract_disk,
"memory": self.extract_memory,
"vcpus": self.extract_vcpus,
"device_roles": self.extract_device_role, "device_roles": self.extract_device_role,
"device_types": self.extract_device_type, "device_types": self.extract_device_type,
"manufacturers": self.extract_manufacturer "manufacturers": self.extract_manufacturer
} }
def extract_disk(self, host):
return host.get("disk")
def extract_vcpus(self, host):
return host.get("vcpus")
def extract_memory(self, host):
return host.get("memory")
def extract_device_type(self, host): def extract_device_type(self, host):
try: try:
return [self.device_types_lookup[host["device_type"]["id"]]] return [self.device_types_lookup[host["device_type"]["id"]]]
@ -319,7 +331,8 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
v = tuple(x.values())[0] v = tuple(x.values())[0]
if not (k in ALLOWED_DEVICE_QUERY_PARAMETERS or k.startswith("cf_")): if not (k in ALLOWED_DEVICE_QUERY_PARAMETERS or k.startswith("cf_")):
self.display.warning("Warning: %s not in %s or starting with cf (Custom field)" % (k, ALLOWED_DEVICE_QUERY_PARAMETERS)) msg = "Warning: %s not in %s or starting with cf (Custom field)" % (k, ALLOWED_DEVICE_QUERY_PARAMETERS)
self.display.warning(msg=msg)
return return
return k, v return k, v
@ -328,9 +341,16 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
query_parameters.extend(filter(lambda x: x, query_parameters.extend(filter(lambda x: x,
map(self.validate_query_parameters, self.query_filters))) map(self.validate_query_parameters, self.query_filters)))
self.device_url = self.api_endpoint + "/api/dcim/devices/" + "?" + urlencode(query_parameters) self.device_url = self.api_endpoint + "/api/dcim/devices/" + "?" + urlencode(query_parameters)
self.virtual_machines_url = "".join([self.api_endpoint,
"/api/virtualization/virtual-machines/",
"?",
urlencode(query_parameters)])
def fetch_hosts(self): def fetch_hosts(self):
return self.get_resource_list(self.device_url) return chain(
self.get_resource_list(self.device_url),
self.get_resource_list(self.virtual_machines_url),
)
def extract_name(self, host): def extract_name(self, host):
# An host in an Ansible inventory requires an hostname. # An host in an Ansible inventory requires an hostname.