From e02c58949e5ed6e93e4a0a165ad82086215bdc82 Mon Sep 17 00:00:00 2001 From: Sam Levenick Date: Thu, 2 Jan 2020 22:27:40 +0000 Subject: [PATCH] Inspec 1 Signed-off-by: Modular Magician --- plugins/modules/gcp_compute_address.py | 9 +++++++++ plugins/modules/gcp_compute_address_info.py | 8 ++++++++ plugins/modules/gcp_compute_firewall.py | 4 ++-- plugins/modules/gcp_compute_instance_template.py | 5 +++++ plugins/modules/gcp_compute_instance_template_info.py | 5 +++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/plugins/modules/gcp_compute_address.py b/plugins/modules/gcp_compute_address.py index 34df3ee..09ec477 100644 --- a/plugins/modules/gcp_compute_address.py +++ b/plugins/modules/gcp_compute_address.py @@ -256,6 +256,14 @@ users: - The URLs of the resources that are using this address. returned: success type: list +status: + description: + - The status of the address, which can be one of RESERVING, RESERVED, or IN_USE. + - An address that is RESERVING is currently in the process of being reserved. + - A RESERVED address is currently reserved and available to use. An IN_USE address + is currently being used by another resource and is not available. + returned: success + type: str region: description: - URL of the region where the regional address resides. @@ -425,6 +433,7 @@ def response_to_hash(module, response): u'networkTier': response.get(u'networkTier'), u'subnetwork': response.get(u'subnetwork'), u'users': response.get(u'users'), + u'status': response.get(u'status'), } diff --git a/plugins/modules/gcp_compute_address_info.py b/plugins/modules/gcp_compute_address_info.py index ceff444..bc9bb04 100644 --- a/plugins/modules/gcp_compute_address_info.py +++ b/plugins/modules/gcp_compute_address_info.py @@ -184,6 +184,14 @@ resources: - The URLs of the resources that are using this address. returned: success type: list + status: + description: + - The status of the address, which can be one of RESERVING, RESERVED, or IN_USE. + - An address that is RESERVING is currently in the process of being reserved. + - A RESERVED address is currently reserved and available to use. An IN_USE address + is currently being used by another resource and is not available. + returned: success + type: str region: description: - URL of the region where the regional address resides. diff --git a/plugins/modules/gcp_compute_firewall.py b/plugins/modules/gcp_compute_firewall.py index a47606b..1c0748c 100644 --- a/plugins/modules/gcp_compute_firewall.py +++ b/plugins/modules/gcp_compute_firewall.py @@ -808,10 +808,10 @@ class FirewallLogconfig(object): self.request = {} def to_request(self): - return remove_nones_from_dict({u'enableLogging': self.request.get('enable_logging')}) + return remove_nones_from_dict({u'enable': self.request.get('enable_logging')}) def from_response(self): - return remove_nones_from_dict({u'enableLogging': self.request.get(u'enableLogging')}) + return remove_nones_from_dict({u'enable': self.request.get(u'enable')}) if __name__ == '__main__': diff --git a/plugins/modules/gcp_compute_instance_template.py b/plugins/modules/gcp_compute_instance_template.py index 38bb071..7149dba 100644 --- a/plugins/modules/gcp_compute_instance_template.py +++ b/plugins/modules/gcp_compute_instance_template.py @@ -600,6 +600,11 @@ properties: returned: success type: complex contains: + licenses: + description: + - Any applicable license URI. + returned: success + type: list autoDelete: description: - Specifies whether the disk will be auto-deleted when the instance is deleted diff --git a/plugins/modules/gcp_compute_instance_template_info.py b/plugins/modules/gcp_compute_instance_template_info.py index a1453c7..8f3de71 100644 --- a/plugins/modules/gcp_compute_instance_template_info.py +++ b/plugins/modules/gcp_compute_instance_template_info.py @@ -162,6 +162,11 @@ resources: returned: success type: complex contains: + licenses: + description: + - Any applicable license URI. + returned: success + type: list autoDelete: description: - Specifies whether the disk will be auto-deleted when the instance