From a62584005d7805efc336a83a442e65ffc2766b21 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Fri, 17 Jan 2020 17:37:03 +0530 Subject: [PATCH] Fix Designate Zone ID lookup for real When there are no 'supported_versions' defined for a client plugin, we should not use version when calling self.client() Also fixes similar issue in resources. Task: 38165 Change-Id: Ifce776e8e8375f6a4399574aa71cc2f81ecc57b0 (cherry picked from commit 2f63735a5c42443fbe9fa5f031259dd08db0bd7a) --- heat/engine/clients/os/designate.py | 2 +- heat/engine/resources/openstack/designate/recordset.py | 4 ---- heat/engine/resources/openstack/designate/zone.py | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/heat/engine/clients/os/designate.py b/heat/engine/clients/os/designate.py index 9a2b25a2f3..05c4c7da41 100644 --- a/heat/engine/clients/os/designate.py +++ b/heat/engine/clients/os/designate.py @@ -39,7 +39,7 @@ class DesignateClientPlugin(client_plugin.ClientPlugin): return isinstance(ex, exceptions.NotFound) def get_zone_id(self, zone_id_or_name): - client = self.client(version='2') + client = self.client() try: zone_obj = client.zones.get(zone_id_or_name) return zone_obj['id'] diff --git a/heat/engine/resources/openstack/designate/recordset.py b/heat/engine/resources/openstack/designate/recordset.py index a97cb90ade..6a85c4aee9 100644 --- a/heat/engine/resources/openstack/designate/recordset.py +++ b/heat/engine/resources/openstack/designate/recordset.py @@ -98,10 +98,6 @@ class DesignateRecordSet(resource.Resource): entity = 'recordsets' - def client(self): - return super(DesignateRecordSet, - self).client(version=self.client_plugin().V2) - def handle_create(self): args = dict((k, v) for k, v in six.iteritems(self.properties) if v) args['type_'] = args.pop(self.TYPE) diff --git a/heat/engine/resources/openstack/designate/zone.py b/heat/engine/resources/openstack/designate/zone.py index 6cd659c2a0..0268b69a2c 100644 --- a/heat/engine/resources/openstack/designate/zone.py +++ b/heat/engine/resources/openstack/designate/zone.py @@ -105,10 +105,6 @@ class DesignateZone(resource.Resource): entity = 'zones' - def client(self): - return super(DesignateZone, - self).client(version=self.client_plugin().V2) - def validate(self): super(DesignateZone, self).validate()