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

Removed additional fetch from config context because it is now available in the host from Netbox v2.6 onwards (#59028)

Browse source 
* Removed additional fetch and config context as an option as it is now available in the host from Netbox v2.6

* Added config-context as an option
This commit is contained in:
nikkytub 2019-09-03 21:23:28 +02:00 • committed by John R Barker
parent b46e661d39
commit 5f9fe6b9c8
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -261,10 +261,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
def extract_config_context(self, host):
try:
if self.config_context:
url = self.api_endpoint + "/api/dcim/devices/" + str(host["id"])
device_lookup = self._fetch_information(url)
return [device_lookup["config_context"]]
return [host["config_context"]]
except Exception:
return
@ -378,8 +375,12 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
if self.query_filters:
query_parameters.extend(filter(lambda x: x,
map(self.validate_query_parameters, self.query_filters)))
self.device_url = self.api_endpoint + "/api/dcim/devices/?" + urlencode(query_parameters)
self.virtual_machines_url = self.api_endpoint + "/api/virtualization/virtual-machines/?" + urlencode(query_parameters)
if self.config_context:
self.device_url = self.api_endpoint + "/api/dcim/devices/?" + urlencode(query_parameters)
self.virtual_machines_url = self.api_endpoint + "/api/virtualization/virtual-machines/?" + urlencode(query_parameters)
else:
self.device_url = self.api_endpoint + "/api/dcim/devices/?" + urlencode(query_parameters) + "&exclude=config_context"
self.virtual_machines_url = self.api_endpoint + "/api/virtualization/virtual-machines/?" + urlencode(query_parameters) + "&exclude=config_context"
def fetch_hosts(self):
return chain(