openstack
/
heat
Code Issues Proposed changes

Use parent handle_delete for keystone 

Use parent implementation of handle_delete method for some keystone
resources.

Change-Id: Ifc6aced8866645ff0b1138a1e38960949e104d3f
This commit is contained in:
Oleksii Chuprykov 2015-09-07 13:51:49 +03:00
parent 1b67662306
commit 7f8c66d32e
8 changed files with 0 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/engine/resources/openstack/keystone/endpoint.py
View File

@ -86,9 +86,6 @@ class KeystoneEndpoint(resource.Resource):
url=url,
name=name)
def _delete_endpoint(self, endpoint_id):
return self.client().endpoints.delete(endpoint_id)
def _update_endpoint(self,
endpoint_id,
new_region=None,
@ -141,13 +138,6 @@ class KeystoneEndpoint(resource.Resource):
new_name=name
)
def handle_delete(self):
if self.resource_id is not None:
try:
self._delete_endpoint(endpoint_id=self.resource_id)
except Exception as ex:
self.client_plugin().ignore_not_found(ex)
def resource_mapping():
return {

10
heat/engine/resources/openstack/keystone/project.py
View File

@ -78,9 +78,6 @@ class KeystoneProject(resource.Resource):
description=description,
enabled=enabled)
def _delete_project(self, project_id):
return self.client().projects.delete(project_id)
def _update_project(self,
project_id,
domain,
@ -134,13 +131,6 @@ class KeystoneProject(resource.Resource):
enabled=enabled
)
def handle_delete(self):
if self.resource_id is not None:
try:
self._delete_project(project_id=self.resource_id)
except Exception as ex:
self.client_plugin().ignore_not_found(ex)
def resource_mapping():
return {

10
heat/engine/resources/openstack/keystone/role.py
View File

@ -48,9 +48,6 @@ class KeystoneRole(resource.Resource):
def _create_role(self, role_name):
return self.client().roles.create(name=role_name)
def _delete_role(self, role_id):
return self.client().roles.delete(role_id)
def _update_role(self, role_id, new_name):
return self.client().roles.update(
role=role_id,
@ -73,13 +70,6 @@ class KeystoneRole(resource.Resource):
new_name=name
)
def handle_delete(self):
if self.resource_id is not None:
try:
self._delete_role(role_id=self.resource_id)
except Exception as ex:
self.client_plugin().ignore_not_found(ex)
def resource_mapping():
return {

10
heat/engine/resources/openstack/keystone/service.py
View File

@ -65,9 +65,6 @@ class KeystoneService(resource.Resource):
description=description,
type=type)
def _delete_service(self, service_id):
return self.client().services.delete(service_id)
def _update_service(self,
service_id,
new_name=None,
@ -108,13 +105,6 @@ class KeystoneService(resource.Resource):
new_type=type
)
def handle_delete(self):
if self.resource_id is not None:
try:
self._delete_service(service_id=self.resource_id)
except Exception as ex:
self.client_plugin().ignore_not_found(ex)
def resource_mapping():
return {

19
heat/tests/keystone/test_endpoint.py
View File

@ -155,25 +155,6 @@ class KeystoneEndpointTest(common.HeatTestCase):
name='foo'
)
def test_endpoint_handle_delete(self):
self.test_endpoint.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
self.endpoints.delete.return_value = None
self.assertIsNone(self.test_endpoint.handle_delete())
self.endpoints.delete.assert_called_once_with(
self.test_endpoint.resource_id
)
def test_endpoint_handle_delete_resource_id_is_none(self):
self.test_endpoint.resource_id = None
self.assertIsNone(self.test_endpoint.handle_delete())
def test_endpoint_handle_delete_not_found(self):
exc = self.keystoneclient.NotFound
self.endpoints.delete.side_effect = exc
self.assertIsNone(self.test_endpoint.handle_delete())
def test_resource_mapping(self):
mapping = endpoint.resource_mapping()
self.assertEqual(1, len(mapping))

19
heat/tests/keystone/test_project.py
View File

@ -324,25 +324,6 @@ class KeystoneProjectTest(common.HeatTestCase):
domain='default'
)
def test_project_handle_delete(self):
self.test_project.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
self.projects.delete.return_value = None
self.assertIsNone(self.test_project.handle_delete())
self.projects.delete.assert_called_once_with(
self.test_project.resource_id
)
def test_project_handle_delete_resource_id_is_none(self):
self.resource_id = None
self.assertIsNone(self.test_project.handle_delete())
def test_project_handle_delete_not_found(self):
exc = self.keystoneclient.NotFound
self.projects.delete.side_effect = exc
self.assertIsNone(self.test_project.handle_delete())
def test_show_resource(self):
project = mock.Mock()
project.to_dict.return_value = {'attr': 'val'}

21
heat/tests/keystone/test_role.py
View File

@ -108,27 +108,6 @@ class KeystoneRoleTest(common.HeatTestCase):
name=prop_diff[role.KeystoneRole.NAME]
)
def test_role_handle_delete(self):
self.test_role.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
self.roles.delete.return_value = None
self.assertIsNone(self.test_role.handle_delete())
self.roles.delete.assert_called_once_with(
self.test_role.resource_id
)
def test_role_handle_delete_resource_id_is_none(self):
self.resource_id = None
self.assertIsNone(self.test_role.handle_delete())
assert not self.roles.delete.called
def test_role_handle_delete_not_found(self):
exc = self.keystoneclient.NotFound
self.roles.delete.side_effect = exc
self.assertIsNone(self.test_role.handle_delete())
def test_show_resource(self):
role = mock.Mock()
role.to_dict.return_value = {'attr': 'val'}

19
heat/tests/keystone/test_service.py
View File

@ -169,25 +169,6 @@ class KeystoneServiceTest(common.HeatTestCase):
description=None
)
def test_service_handle_delete(self):
self.test_service.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
self.services.delete.return_value = None
self.assertIsNone(self.test_service.handle_delete())
self.services.delete.assert_called_once_with(
self.test_service.resource_id
)
def test_service_handle_delete_resource_id_is_none(self):
self.test_service.resource_id = None
self.assertIsNone(self.test_service.handle_delete())
def test_service_handle_delete_not_found(self):
exc = self.keystoneclient.NotFound
self.services.delete.side_effect = exc
self.assertIsNone(self.test_service.handle_delete())
def test_resource_mapping(self):
mapping = service.resource_mapping()
self.assertEqual(1, len(mapping))