From f0f58a868595617b6ce270bb33032462c1ec3b90 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Mon, 16 Jan 2017 17:24:53 +0800 Subject: [PATCH] Remove handle_delete() for keystone group Change-Id: I77480b2383a188e9739e28517f72f587936ebaa8 --- heat/engine/resources/openstack/keystone/group.py | 5 ----- heat/tests/openstack/keystone/test_group.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/heat/engine/resources/openstack/keystone/group.py b/heat/engine/resources/openstack/keystone/group.py index 19a1a584cc..6e5ccedaa8 100644 --- a/heat/engine/resources/openstack/keystone/group.py +++ b/heat/engine/resources/openstack/keystone/group.py @@ -120,11 +120,6 @@ class KeystoneGroup(resource.Resource, self.update_assignment(prop_diff=prop_diff, group_id=self.resource_id) - def handle_delete(self): - if self.resource_id is not None: - with self.client_plugin().ignore_not_found: - self.client().groups.delete(self.resource_id) - def parse_live_resource_data(self, resource_properties, resource_data): return { self.NAME: resource_data.get(self.NAME), diff --git a/heat/tests/openstack/keystone/test_group.py b/heat/tests/openstack/keystone/test_group.py index 93e5b4a8b8..a6f53b2cc7 100644 --- a/heat/tests/openstack/keystone/test_group.py +++ b/heat/tests/openstack/keystone/test_group.py @@ -285,7 +285,7 @@ class KeystoneGroupTest(common.HeatTestCase): self.test_group.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151' self.groups.delete.return_value = None - self.assertIsNone(self.test_group.handle_delete()) + self.test_group.handle_delete() self.groups.delete.assert_called_once_with( self.test_group.resource_id )