From 6c4fae3b34946025896b0248b8a65a5c842d84b0 Mon Sep 17 00:00:00 2001 From: The Magician Date: Wed, 30 Jan 2019 14:11:08 -0800 Subject: [PATCH] response_to_hash should use api_name (#181) /cc @rambleraptor --- plugins/modules/gcp_compute_firewall.py | 4 ++-- plugins/modules/gcp_compute_network.py | 2 +- plugins/modules/gcp_dns_resource_record_set.py | 2 +- plugins/modules/gcp_resourcemanager_project.py | 2 +- plugins/modules/gcp_storage_bucket.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/modules/gcp_compute_firewall.py b/plugins/modules/gcp_compute_firewall.py index 9b177b6..6a25115 100644 --- a/plugins/modules/gcp_compute_firewall.py +++ b/plugins/modules/gcp_compute_firewall.py @@ -669,7 +669,7 @@ class FirewallAllowedArray(object): return remove_nones_from_dict({u'IPProtocol': item.get('ip_protocol'), u'ports': item.get('ports')}) def _response_from_item(self, item): - return remove_nones_from_dict({u'IPProtocol': item.get(u'ip_protocol'), u'ports': item.get(u'ports')}) + return remove_nones_from_dict({u'IPProtocol': item.get(u'IPProtocol'), u'ports': item.get(u'ports')}) class FirewallDeniedArray(object): @@ -696,7 +696,7 @@ class FirewallDeniedArray(object): return remove_nones_from_dict({u'IPProtocol': item.get('ip_protocol'), u'ports': item.get('ports')}) def _response_from_item(self, item): - return remove_nones_from_dict({u'IPProtocol': item.get(u'ip_protocol'), u'ports': item.get(u'ports')}) + return remove_nones_from_dict({u'IPProtocol': item.get(u'IPProtocol'), u'ports': item.get(u'ports')}) if __name__ == '__main__': diff --git a/plugins/modules/gcp_compute_network.py b/plugins/modules/gcp_compute_network.py index b5d1201..b3b0921 100644 --- a/plugins/modules/gcp_compute_network.py +++ b/plugins/modules/gcp_compute_network.py @@ -340,7 +340,7 @@ def is_different(module, response): def response_to_hash(module, response): return { u'description': module.params.get('description'), - u'gatewayIPv4': response.get(u'gateway_ipv4'), + u'gatewayIPv4': response.get(u'gatewayIPv4'), u'id': response.get(u'id'), u'IPv4Range': module.params.get('ipv4_range'), u'name': module.params.get('name'), diff --git a/plugins/modules/gcp_dns_resource_record_set.py b/plugins/modules/gcp_dns_resource_record_set.py index 1119c7e..a21308e 100644 --- a/plugins/modules/gcp_dns_resource_record_set.py +++ b/plugins/modules/gcp_dns_resource_record_set.py @@ -326,7 +326,7 @@ def is_different(module, response): # Remove unnecessary properties from the response. # This is for doing comparisons with Ansible's current parameters. def response_to_hash(module, response): - return {u'name': response.get(u'name'), u'type': response.get(u'type'), u'ttl': response.get(u'ttl'), u'rrdatas': response.get(u'target')} + return {u'name': response.get(u'name'), u'type': response.get(u'type'), u'ttl': response.get(u'ttl'), u'rrdatas': response.get(u'rrdatas')} def updated_record(module): diff --git a/plugins/modules/gcp_resourcemanager_project.py b/plugins/modules/gcp_resourcemanager_project.py index 90d10c9..480d130 100644 --- a/plugins/modules/gcp_resourcemanager_project.py +++ b/plugins/modules/gcp_resourcemanager_project.py @@ -305,7 +305,7 @@ def is_different(module, response): # This is for doing comparisons with Ansible's current parameters. def response_to_hash(module, response): return { - u'projectNumber': response.get(u'number'), + u'projectNumber': response.get(u'projectNumber'), u'lifecycleState': response.get(u'lifecycleState'), u'name': response.get(u'name'), u'createTime': response.get(u'createTime'), diff --git a/plugins/modules/gcp_storage_bucket.py b/plugins/modules/gcp_storage_bucket.py index 717a309..691b216 100644 --- a/plugins/modules/gcp_storage_bucket.py +++ b/plugins/modules/gcp_storage_bucket.py @@ -1281,7 +1281,7 @@ class BucketCondition(object): def from_response(self): return remove_nones_from_dict( { - u'age': self.request.get(u'ageDays'), + u'age': self.request.get(u'age'), u'createdBefore': self.request.get(u'createdBefore'), u'isLive': self.request.get(u'isLive'), u'matchesStorageClass': self.request.get(u'matchesStorageClass'),