openstack
/
heat
Code Issues Proposed changes

Merge "Add stack_user_project_id to _create_stack RPC interface"

This commit is contained in:
Jenkins 2014-12-05 10:42:20 +00:00 committed by Gerrit Code Review
parent ba05ca8a44 0c6bff0e73
commit cbc351e354
4 changed files with 67 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
heat/rpc/client.py
View File

@ -179,7 +179,8 @@ class EngineClient(object):
args)
def _create_stack(self, ctxt, stack_name, template, params, files, args,
owner_id=None, nested_depth=0, user_creds_id=None):
owner_id=None, nested_depth=0, user_creds_id=None,
stack_user_project_id=None):
"""
Internal create_stack interface for engine-to-engine communication via
RPC. Allows some additional options which should not be exposed to
@ -187,14 +188,17 @@ class EngineClient(object):
:param owner_id: parent stack ID for nested stacks
:param nested_depth: nested depth for nested stacks
:param user_creds_id: user_creds record for nested stack
:param stack_user_project_id: stack user project for nested stack
"""
return self.call(ctxt,
self.make_msg('create_stack', stack_name=stack_name,
template=template,
params=params, files=files, args=args,
owner_id=owner_id,
nested_depth=nested_depth,
user_creds_id=user_creds_id))
return self.call(
ctxt, self.make_msg('create_stack', stack_name=stack_name,
template=template,
params=params, files=files, args=args,
owner_id=owner_id,
nested_depth=nested_depth,
user_creds_id=user_creds_id,
stack_user_project_id=stack_user_project_id),
version='1.2')
def update_stack(self, ctxt, stack_identity, template, params,
files, args):

40
heat/tests/test_api_cfn_v1.py
View File

@ -514,7 +514,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndReturn(engine_resp)
self.m.ReplayAll()
@ -563,7 +565,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndReturn(engine_resp)
self.m.ReplayAll()
@ -612,7 +616,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndReturn(engine_resp)
self.m.ReplayAll()
@ -661,7 +667,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndReturn(engine_resp)
self.m.ReplayAll()
@ -710,7 +718,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndReturn(engine_resp)
self.m.ReplayAll()
@ -797,7 +807,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(AttributeError())
policy.Enforcer.enforce(dummy_req.context, 'CreateStack'
@ -812,7 +824,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(heat_exception.UnknownUserParameter(key='test'))
policy.Enforcer.enforce(dummy_req.context, 'CreateStack'
@ -827,7 +841,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(heat_exception.UserParameterMissing(key='test'))
self.m.ReplayAll()
@ -869,7 +885,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(heat_exception.StackExists(stack_name='test'))
self.m.ReplayAll()
@ -905,7 +923,9 @@ class CfnStackControllerTest(common.HeatTestCase):
'args': engine_args,
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(heat_exception.StackValidationFailed(
message='Something went wrong'))

32
heat/tests/test_api_openstack_v1.py
View File

@ -715,7 +715,9 @@ class StackControllerTest(ControllerTest, common.HeatTestCase):
'args': {'timeout_mins': 30},
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndReturn(dict(identity))
self.m.ReplayAll()
@ -774,7 +776,9 @@ class StackControllerTest(ControllerTest, common.HeatTestCase):
'adopt_stack_data': str(adopt_data)},
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndReturn(dict(identity))
self.m.ReplayAll()
@ -836,7 +840,9 @@ class StackControllerTest(ControllerTest, common.HeatTestCase):
'args': {'timeout_mins': 30},
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndReturn(dict(identity))
self.m.ReplayAll()
@ -876,7 +882,9 @@ class StackControllerTest(ControllerTest, common.HeatTestCase):
'args': {'timeout_mins': 30},
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(to_remote_error(AttributeError()))
rpc_client.EngineClient.call(
req.context,
@ -889,7 +897,9 @@ class StackControllerTest(ControllerTest, common.HeatTestCase):
'args': {'timeout_mins': 30},
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(to_remote_error(unknown_parameter))
rpc_client.EngineClient.call(
req.context,
@ -902,7 +912,9 @@ class StackControllerTest(ControllerTest, common.HeatTestCase):
'args': {'timeout_mins': 30},
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(to_remote_error(missing_parameter))
self.m.ReplayAll()
resp = request_with_middleware(fault.FaultWrapper,
@ -952,7 +964,9 @@ class StackControllerTest(ControllerTest, common.HeatTestCase):
'args': {'timeout_mins': 30},
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(to_remote_error(error))
self.m.ReplayAll()
@ -1008,7 +1022,9 @@ class StackControllerTest(ControllerTest, common.HeatTestCase):
'args': {'timeout_mins': 30},
'owner_id': None,
'nested_depth': 0,
'user_creds_id': None})
'user_creds_id': None,
'stack_user_project_id': None}),
version='1.2'
).AndRaise(to_remote_error(error))
self.m.ReplayAll()

1
heat/tests/test_rpc_client.py
View File

@ -156,6 +156,7 @@ class EngineRpcAPITestCase(testtools.TestCase):
call_kwargs['owner_id'] = None
call_kwargs['nested_depth'] = 0
call_kwargs['user_creds_id'] = None
call_kwargs['stack_user_project_id'] = None
expected_message = self.rpcapi.make_msg('create_stack', **call_kwargs)
kwargs['expected_message'] = expected_message
self._test_engine_api('create_stack', 'call', **kwargs)