openstack
/
heat
Code Issues Proposed changes

Remove handle_delete() for keystone group 

Change-Id: I77480b2383a188e9739e28517f72f587936ebaa8
This commit is contained in:
huangtianhua 2017-01-16 17:24:53 +08:00
parent 379639ec93
commit f0f58a8685
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources/openstack/keystone/group.py
View File

@ -120,11 +120,6 @@ class KeystoneGroup(resource.Resource,
self.update_assignment(prop_diff=prop_diff, self.update_assignment(prop_diff=prop_diff,
group_id=self.resource_id) 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): def parse_live_resource_data(self, resource_properties, resource_data):
return { return {
self.NAME: resource_data.get(self.NAME), self.NAME: resource_data.get(self.NAME),

2
heat/tests/openstack/keystone/test_group.py
View File

@ -285,7 +285,7 @@ class KeystoneGroupTest(common.HeatTestCase):
self.test_group.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151' self.test_group.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
self.groups.delete.return_value = None 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.groups.delete.assert_called_once_with(
self.test_group.resource_id self.test_group.resource_id
) )