openstack
/
heat
Code Issues Proposed changes

Remove _show_resource from barbican resources 

Now we can delete overrided _show_resource for
barbican resources in case of latest barbicanclient
version.

Change-Id: I9699cdc907ec7dd5bf975d19f6f4d4617f37d32d
This commit is contained in:
Peter Razumovsky 2015-12-03 16:13:02 +03:00
parent 6483cfd5ac
commit dc28090513
6 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/resources/openstack/barbican/container.py
View File

@ -146,12 +146,6 @@ class GenericContainer(resource.Resource):
container = self.client().containers.get(self.resource_id)
return getattr(container, name, None)
# TODO(ochuprykov): remove this method when bug #1485619 will be fixed
def _show_resource(self):
container = self.client().containers.get(self.resource_id)
info = container._get_formatted_entity()
return dict(zip(info[0], info[1]))
class CertificateContainer(GenericContainer):
"""A resource for creating barbican certificate container.

6
heat/engine/resources/openstack/barbican/order.py
View File

@ -266,12 +266,6 @@ class Order(resource.Resource):
return getattr(order, name)
# TODO(ochuprykov): remove this method when bug #1485619 will be fixed
def _show_resource(self):
order = self.client().orders.get(self.resource_id)
info = order._get_formatted_entity()
return dict(zip(info[0], info[1]))
def resource_mapping():
return {

6
heat/engine/resources/openstack/barbican/secret.py
View File

@ -187,12 +187,6 @@ class Secret(resource.Resource):
if name == self.STATUS:
return secret.status
# TODO(ochuprykov): remove this method when bug #1485619 will be fixed
def _show_resource(self):
order = self.client().secrets.get(self.resource_id)
info = order._get_formatted_entity()
return dict(zip(info[0], info[1]))
def resource_mapping():
return {

3
heat/tests/openstack/barbican/test_container.py
View File

@ -182,8 +182,6 @@ class TestContainer(common.HeatTestCase):
mock_container.container_ref = 'test-container-ref'
mock_container.secret_refs = {'name': 'ref'}
mock_container.consumers = [{'name': 'name1', 'ref': 'ref1'}]
mock_container._get_formatted_entity.return_value = (
('attr', ), ('v',))
res = self._create_resource('foo')
self.client.containers.get.return_value = mock_container
self.assertEqual('test-status', res.FnGetAtt('status'))
@ -191,7 +189,6 @@ class TestContainer(common.HeatTestCase):
self.assertEqual({'name': 'ref'}, res.FnGetAtt('secret_refs'))
self.assertEqual([{'name': 'name1', 'ref': 'ref1'}],
res.FnGetAtt('consumers'))
self.assertEqual({'attr': 'v'}, res.FnGetAtt('show'))
def test_check_create_complete(self):
tmpl = template_format.parse(template_by_name())

2
heat/tests/openstack/barbican/test_order.py
View File

@ -156,14 +156,12 @@ class TestOrder(common.HeatTestCase):
mock_order.status = 'test-status'
mock_order.order_ref = 'test-order-ref'
mock_order.secret_ref = 'test-secret-ref'
mock_order._get_formatted_entity.return_value = (('attr', ), ('v',))
res = self._create_resource('foo', self.res_template, self.stack)
self.barbican.orders.get.return_value = mock_order
self.assertEqual('test-order-ref', res.FnGetAtt('order_ref'))
self.assertEqual('test-secret-ref', res.FnGetAtt('secret_ref'))
self.assertEqual({'attr': 'v'}, res.FnGetAtt('show'))
def test_attributes_handle_exceptions(self):
mock_order = mock.Mock()

2
heat/tests/openstack/barbican/test_secret.py
View File

@ -80,11 +80,9 @@ class TestSecret(common.HeatTestCase):
mock_secret.status = 'test-status'
self.barbican.secrets.get.return_value = mock_secret
mock_secret.payload = 'foo'
mock_secret._get_formatted_entity.return_value = (('attr', ), ('v',))
self.assertEqual('test-status', self.res.FnGetAtt('status'))
self.assertEqual('foo', self.res.FnGetAtt('decrypted_payload'))
self.assertEqual({'attr': 'v'}, self.res.FnGetAtt('show'))
def test_attributes_handles_exceptions(self):
self.barbican.barbican_client.HTTPClientError = Exception