openstack/shade
Code Issues Proposed changes

Merge "Make get_stack fetch a single full stack"

Browse Source
This commit is contained in:
Jenkins 2016-04-01 18:36:30 +00:00 committed by Gerrit Code Review
commit 75bb222fdd
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shade/_tasks.py
View File

@ -767,3 +767,8 @@ class StackCreate(task_manager.Task):
class StackDelete(task_manager.Task): class StackDelete(task_manager.Task):
def main(self, client): def main(self, client):
return client.heat_client.stacks.delete(self.args['id']) return client.heat_client.stacks.delete(self.args['id'])
class StackGet(task_manager.Task):
def main(self, client):
return client.heat_client.stacks.get(**self.args)

12
shade/openstackcloud.py
View File

@ -1771,8 +1771,18 @@ class OpenStackCloud(object):
:raises: ``OpenStackCloudException`` if something goes wrong during the :raises: ``OpenStackCloudException`` if something goes wrong during the
openstack API call or if multiple matches are found. openstack API call or if multiple matches are found.
""" """
def search_one_stack(name_or_id=None, filters=None):
# stack names are mandatory and enforced unique in the project
# so a StackGet can always be used for name or ID.
with _utils.shade_exceptions("Error fetching stack"):
stacks = [self.manager.submitTask(
_tasks.StackGet(stack_id=name_or_id))]
nstacks = _utils.normalize_stacks(stacks)
return _utils._filter_list(nstacks, name_or_id, filters)
return _utils._get_entity( return _utils._get_entity(
self.search_stacks, name_or_id, filters) search_one_stack, name_or_id, filters)
def create_keypair(self, name, public_key): def create_keypair(self, name, public_key):
"""Create a new keypair. """Create a new keypair.

2
shade/tests/unit/test_stack.py
View File

@ -145,7 +145,7 @@ class TestStack(base.TestCase):
@mock.patch.object(shade.OpenStackCloud, 'heat_client') @mock.patch.object(shade.OpenStackCloud, 'heat_client')
def test_get_stack(self, mock_heat): def test_get_stack(self, mock_heat):
stack = fakes.FakeStack('azerty', 'stack',) stack = fakes.FakeStack('azerty', 'stack',)
mock_heat.stacks.list.return_value = [stack] mock_heat.stacks.get.return_value = stack
res = self.cloud.get_stack('stack') res = self.cloud.get_stack('stack')
self.assertIsNotNone(res) self.assertIsNotNone(res)
self.assertEqual(stack.stack_name, res['stack_name']) self.assertEqual(stack.stack_name, res['stack_name'])