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

Fix netbox url with string concat (#49943)

Browse source 
* Fix netbox url with string concat

* Add logic to trim extra / at the end of api_endpoint

See PR#49943

* Add in strip of any trailing '/'

* Update logic to look at the self.get_option of api_endpoint

* Update to move to remove if logic and just strip the api_endpoint
This commit is contained in:
Heath Brown 2019-03-14 16:05:47 -05:00 committed by ansibot
parent b8349b1d61
commit 53b5dff23e
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,7 +262,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
def extract_config_context(self, host): def extract_config_context(self, host):
try: try:
if self.config_context: if self.config_context:
url = urljoin(self.api_endpoint, "/api/dcim/devices/" + str(host["id"])) url = self.api_endpoint + "/api/dcim/devices/" + str(host["id"])
device_lookup = self._fetch_information(url) device_lookup = self._fetch_information(url)
return [device_lookup["config_context"]] return [device_lookup["config_context"]]
except Exception: except Exception:
@ -299,42 +299,42 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
return host["tags"] return host["tags"]
def refresh_platforms_lookup(self): def refresh_platforms_lookup(self):
url = urljoin(self.api_endpoint, "/api/dcim/platforms/?limit=0") url = self.api_endpoint + "/api/dcim/platforms/?limit=0"
platforms = self.get_resource_list(api_url=url) platforms = self.get_resource_list(api_url=url)
self.platforms_lookup = dict((platform["id"], platform["name"]) for platform in platforms) self.platforms_lookup = dict((platform["id"], platform["name"]) for platform in platforms)
def refresh_sites_lookup(self): def refresh_sites_lookup(self):
url = urljoin(self.api_endpoint, "/api/dcim/sites/?limit=0") url = self.api_endpoint + "/api/dcim/sites/?limit=0"
sites = self.get_resource_list(api_url=url) sites = self.get_resource_list(api_url=url)
self.sites_lookup = dict((site["id"], site["name"]) for site in sites) self.sites_lookup = dict((site["id"], site["name"]) for site in sites)
def refresh_regions_lookup(self): def refresh_regions_lookup(self):
url = urljoin(self.api_endpoint, "/api/dcim/regions/?limit=0") url = self.api_endpoint + "/api/dcim/regions/?limit=0"
regions = self.get_resource_list(api_url=url) regions = self.get_resource_list(api_url=url)
self.regions_lookup = dict((region["id"], region["name"]) for region in regions) self.regions_lookup = dict((region["id"], region["name"]) for region in regions)
def refresh_tenants_lookup(self): def refresh_tenants_lookup(self):
url = urljoin(self.api_endpoint, "/api/tenancy/tenants/?limit=0") url = self.api_endpoint + "/api/tenancy/tenants/?limit=0"
tenants = self.get_resource_list(api_url=url) tenants = self.get_resource_list(api_url=url)
self.tenants_lookup = dict((tenant["id"], tenant["name"]) for tenant in tenants) self.tenants_lookup = dict((tenant["id"], tenant["name"]) for tenant in tenants)
def refresh_racks_lookup(self): def refresh_racks_lookup(self):
url = urljoin(self.api_endpoint, "/api/dcim/racks/?limit=0") url = self.api_endpoint + "/api/dcim/racks/?limit=0"
racks = self.get_resource_list(api_url=url) racks = self.get_resource_list(api_url=url)
self.racks_lookup = dict((rack["id"], rack["name"]) for rack in racks) self.racks_lookup = dict((rack["id"], rack["name"]) for rack in racks)
def refresh_device_roles_lookup(self): def refresh_device_roles_lookup(self):
url = urljoin(self.api_endpoint, "/api/dcim/device-roles/?limit=0") url = self.api_endpoint + "/api/dcim/device-roles/?limit=0"
device_roles = self.get_resource_list(api_url=url) device_roles = self.get_resource_list(api_url=url)
self.device_roles_lookup = dict((device_role["id"], device_role["name"]) for device_role in device_roles) self.device_roles_lookup = dict((device_role["id"], device_role["name"]) for device_role in device_roles)
def refresh_device_types_lookup(self): def refresh_device_types_lookup(self):
url = urljoin(self.api_endpoint, "/api/dcim/device-types/?limit=0") url = self.api_endpoint + "/api/dcim/device-types/?limit=0"
device_types = self.get_resource_list(api_url=url) device_types = self.get_resource_list(api_url=url)
self.device_types_lookup = dict((device_type["id"], device_type["model"]) for device_type in device_types) self.device_types_lookup = dict((device_type["id"], device_type["model"]) for device_type in device_types)
def refresh_manufacturers_lookup(self): def refresh_manufacturers_lookup(self):
url = urljoin(self.api_endpoint, "/api/dcim/manufacturers/?limit=0") url = self.api_endpoint + "/api/dcim/manufacturers/?limit=0"
manufacturers = self.get_resource_list(api_url=url) manufacturers = self.get_resource_list(api_url=url)
self.manufacturers_lookup = dict((manufacturer["id"], manufacturer["name"]) for manufacturer in manufacturers) self.manufacturers_lookup = dict((manufacturer["id"], manufacturer["name"]) for manufacturer in manufacturers)
@ -377,10 +377,8 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
if self.query_filters: if self.query_filters:
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 = urljoin(self.api_endpoint, self.device_url = self.api_endpoint + "/api/dcim/devices/?" + urlencode(query_parameters)
"/api/dcim/devices/?" + urlencode(query_parameters)) self.virtual_machines_url = self.api_endpoint + "/api/virtualization/virtual-machines/?" + urlencode(query_parameters)
self.virtual_machines_url = urljoin(self.api_endpoint,
"/api/virtualization/virtual-machines/?" + urlencode(query_parameters))
def fetch_hosts(self): def fetch_hosts(self):
return chain( return chain(
@ -448,7 +446,8 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
# Netbox access # Netbox access
token = self.get_option("token") token = self.get_option("token")
self.api_endpoint = self.get_option("api_endpoint") # Handle extra "/" from api_endpoint configuration and trim if necessary, see PR#49943
self.api_endpoint = self.get_option("api_endpoint").strip('/')
self.timeout = self.get_option("timeout") self.timeout = self.get_option("timeout")
self.validate_certs = self.get_option("validate_certs") self.validate_certs = self.get_option("validate_certs")
self.config_context = self.get_option("config_context") self.config_context = self.get_option("config_context")