mirror of
https://github.com/ansible-collections/google.cloud.git
synced 2025-08-03 04:34:31 -07:00
Merge branch 'ansible-collections:master' into master
This commit is contained in:
commit
b9599e31c8
2 changed files with 38 additions and 30 deletions
8
codecov.yml
Normal file
8
codecov.yml
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
coverage:
|
||||||
|
status:
|
||||||
|
project:
|
||||||
|
default:
|
||||||
|
informational: true
|
||||||
|
patch:
|
||||||
|
default:
|
||||||
|
informational: true
|
|
@ -487,38 +487,38 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
session_responses.append(response_json)
|
session_responses.append(response_json)
|
||||||
page_token = "pageToken" in request_params
|
page_token = "pageToken" in request_params
|
||||||
|
|
||||||
for response in session_responses:
|
for response in session_responses:
|
||||||
if "items" in response:
|
if "items" in response:
|
||||||
# example k would be a zone or region name
|
# example k would be a zone or region name
|
||||||
# example v would be { "disks" : [], "otherkey" : "..." }
|
# example v would be { "disks" : [], "otherkey" : "..." }
|
||||||
for zone_or_region, aggregate in response["items"].items():
|
for zone_or_region, aggregate in response["items"].items():
|
||||||
if "zones" in zone_or_region:
|
if "zones" in zone_or_region:
|
||||||
if "disks" in aggregate:
|
if "disks" in aggregate:
|
||||||
zone = zone_or_region.replace("zones/", "")
|
zone = zone_or_region.replace("zones/", "")
|
||||||
for disk in aggregate["disks"]:
|
for disk in aggregate["disks"]:
|
||||||
if (
|
if (
|
||||||
"zones" in config_data
|
"zones" in config_data
|
||||||
and zone in config_data["zones"]
|
and zone in config_data["zones"]
|
||||||
):
|
):
|
||||||
# If zones specified, only store those zones' data
|
# If zones specified, only store those zones' data
|
||||||
if "sourceImage" in disk:
|
if "sourceImage" in disk:
|
||||||
self._project_disks[
|
self._project_disks[
|
||||||
disk["selfLink"]
|
disk["selfLink"]
|
||||||
] = disk["sourceImage"].split("/")[-1]
|
] = disk["sourceImage"].split("/")[-1]
|
||||||
else:
|
else:
|
||||||
self._project_disks[
|
self._project_disks[
|
||||||
disk["selfLink"]
|
disk["selfLink"]
|
||||||
] = disk["selfLink"].split("/")[-1]
|
] = disk["selfLink"].split("/")[-1]
|
||||||
|
|
||||||
else:
|
|
||||||
if "sourceImage" in disk:
|
|
||||||
self._project_disks[
|
|
||||||
disk["selfLink"]
|
|
||||||
] = disk["sourceImage"].split("/")[-1]
|
|
||||||
else:
|
else:
|
||||||
self._project_disks[
|
if "sourceImage" in disk:
|
||||||
disk["selfLink"]
|
self._project_disks[
|
||||||
] = disk["selfLink"].split("/")[-1]
|
disk["selfLink"]
|
||||||
|
] = disk["sourceImage"].split("/")[-1]
|
||||||
|
else:
|
||||||
|
self._project_disks[
|
||||||
|
disk["selfLink"]
|
||||||
|
] = disk["selfLink"].split("/")[-1]
|
||||||
|
|
||||||
return self._project_disks
|
return self._project_disks
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue