openstack/heat
Code Issues Proposed changes

Merge "Remove mox from test_waitcondition"

Browse Source
This commit is contained in:
Zuul 2018-03-09 12:34:15 +00:00 committed by Gerrit Code Review
commit c37bc8ca25
1 changed files with 41 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
heat/tests/openstack/heat/test_waitcondition.py
View File

@ -15,7 +15,6 @@ import datetime
import uuid import uuid
import mock import mock
import mox
from oslo_serialization import jsonutils as json from oslo_serialization import jsonutils as json
from oslo_utils import timeutils from oslo_utils import timeutils
import six import six
@ -163,27 +162,20 @@ class HeatWaitConditionTest(common.HeatTestCase):
if stub: if stub:
id = identifier.ResourceIdentifier('test_tenant', stack.name, id = identifier.ResourceIdentifier('test_tenant', stack.name,
stack.id, '', 'wait_handle') stack.id, '', 'wait_handle')
self.m.StubOutWithMock(h_wch.HeatWaitConditionHandle, self.patchobject(h_wch.HeatWaitConditionHandle, 'identifier',
'identifier') return_value=id)
h_wch.HeatWaitConditionHandle.identifier(
).MultipleTimes().AndReturn(id)
if stub_status: if stub_status:
self.m.StubOutWithMock(h_wch.HeatWaitConditionHandle, self.patchobject(h_wch.HeatWaitConditionHandle, 'get_status')
'get_status')
return stack return stack
def test_post_complete_to_handle(self): def test_post_complete_to_handle(self):
self.stack = self.create_stack() self.stack = self.create_stack()
h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS']) mock_get_status = h_wch.HeatWaitConditionHandle.get_status
h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS', mock_get_status.side_effect = ([['SUCCESS'],
'SUCCESS']) ['SUCCESS', 'SUCCESS'],
h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS', ['SUCCESS', 'SUCCESS', 'SUCCESS']])
'SUCCESS',
'SUCCESS'])
self.m.ReplayAll()
self.stack.create() self.stack.create()
@ -194,18 +186,14 @@ class HeatWaitConditionTest(common.HeatTestCase):
r = resource_objects.Resource.get_by_name_and_stack( r = resource_objects.Resource.get_by_name_and_stack(
self.stack.context, 'wait_handle', self.stack.id) self.stack.context, 'wait_handle', self.stack.id)
self.assertEqual('wait_handle', r.name) self.assertEqual('wait_handle', r.name)
self.m.VerifyAll() self.assertEqual(3, mock_get_status.call_count)
def test_post_failed_to_handle(self): def test_post_failed_to_handle(self):
self.stack = self.create_stack() self.stack = self.create_stack()
h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS']) mock_get_status = h_wch.HeatWaitConditionHandle.get_status
h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS', mock_get_status.side_effect = ([['SUCCESS'],
'SUCCESS']) ['SUCCESS', 'SUCCESS'],
h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS', ['SUCCESS', 'SUCCESS', 'FAILURE']])
'SUCCESS',
'FAILURE'])
self.m.ReplayAll()
self.stack.create() self.stack.create()
@ -218,11 +206,10 @@ class HeatWaitConditionTest(common.HeatTestCase):
r = resource_objects.Resource.get_by_name_and_stack( r = resource_objects.Resource.get_by_name_and_stack(
self.stack.context, 'wait_handle', self.stack.id) self.stack.context, 'wait_handle', self.stack.id)
self.assertEqual('wait_handle', r.name) self.assertEqual('wait_handle', r.name)
self.m.VerifyAll() self.assertEqual(3, mock_get_status.call_count)
def _test_wait_handle_invalid(self, tmpl, handle_name): def _test_wait_handle_invalid(self, tmpl, handle_name):
self.stack = self.create_stack(template=tmpl) self.stack = self.create_stack(template=tmpl)
self.m.ReplayAll()
self.stack.create() self.stack.create()
rsrc = self.stack['wait_condition'] rsrc = self.stack['wait_condition']
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state) self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
@ -243,8 +230,7 @@ class HeatWaitConditionTest(common.HeatTestCase):
self.stack = self.create_stack() self.stack = self.create_stack()
# Avoid the stack create exercising the timeout code at the same time # Avoid the stack create exercising the timeout code at the same time
self.m.StubOutWithMock(self.stack, 'timeout_secs') self.stack.timeout_secs = mock.Mock(return_value=None)
self.stack.timeout_secs().MultipleTimes().AndReturn(None)
now = timeutils.utcnow() now = timeutils.utcnow()
periods = [0, 0.001, 0.1, 4.1, 5.1] periods = [0, 0.001, 0.1, 4.1, 5.1]
@ -256,8 +242,6 @@ class HeatWaitConditionTest(common.HeatTestCase):
h_wch.HeatWaitConditionHandle.get_status( h_wch.HeatWaitConditionHandle.get_status(
).MultipleTimes().AndReturn([]) ).MultipleTimes().AndReturn([])
self.m.ReplayAll()
self.stack.create() self.stack.create()
rsrc = self.stack['wait_condition'] rsrc = self.stack['wait_condition']
@ -266,14 +250,12 @@ class HeatWaitConditionTest(common.HeatTestCase):
reason = rsrc.status_reason reason = rsrc.status_reason
self.assertTrue(reason.startswith('WaitConditionTimeout:')) self.assertTrue(reason.startswith('WaitConditionTimeout:'))
self.m.VerifyAll()
def _create_heat_wc_and_handle(self): def _create_heat_wc_and_handle(self):
self.stack = self.create_stack( self.stack = self.create_stack(
template=test_template_heat_waitcondition) template=test_template_heat_waitcondition)
h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS']) mock_get_status = h_wch.HeatWaitConditionHandle.get_status
mock_get_status.side_effect = ([['SUCCESS']])
self.m.ReplayAll()
self.stack.create() self.stack.create()
rsrc = self.stack['wait_condition'] rsrc = self.stack['wait_condition']
@ -284,10 +266,10 @@ class HeatWaitConditionTest(common.HeatTestCase):
handle = self.stack['wait_handle'] handle = self.stack['wait_handle']
self.assertEqual((handle.CREATE, handle.COMPLETE), handle.state) self.assertEqual((handle.CREATE, handle.COMPLETE), handle.state)
return (rsrc, handle) return (rsrc, handle, mock_get_status)
def test_data(self): def test_data(self):
rsrc, handle = self._create_heat_wc_and_handle() rsrc, handle, mock_get_status = self._create_heat_wc_and_handle()
test_metadata = {'data': 'foo', 'reason': 'bar', test_metadata = {'data': 'foo', 'reason': 'bar',
'status': 'SUCCESS', 'id': '123'} 'status': 'SUCCESS', 'id': '123'}
ret = handle.handle_signal(details=test_metadata) ret = handle.handle_signal(details=test_metadata)
@ -302,10 +284,10 @@ class HeatWaitConditionTest(common.HeatTestCase):
self.assertEqual(json.loads(u'{"123": "foo", "456": "dog"}'), self.assertEqual(json.loads(u'{"123": "foo", "456": "dog"}'),
json.loads(wc_att)) json.loads(wc_att))
self.assertEqual('status:SUCCESS reason:cat', ret) self.assertEqual('status:SUCCESS reason:cat', ret)
self.m.VerifyAll() mock_get_status.assert_called_once()
def test_data_noid(self): def test_data_noid(self):
rsrc, handle = self._create_heat_wc_and_handle() rsrc, handle, mock_get_status = self._create_heat_wc_and_handle()
test_metadata = {'data': 'foo', 'reason': 'bar', test_metadata = {'data': 'foo', 'reason': 'bar',
'status': 'SUCCESS'} 'status': 'SUCCESS'}
ret = handle.handle_signal(details=test_metadata) ret = handle.handle_signal(details=test_metadata)
@ -320,10 +302,10 @@ class HeatWaitConditionTest(common.HeatTestCase):
self.assertEqual(json.loads(u'{"1": "foo", "2": "dog"}'), self.assertEqual(json.loads(u'{"1": "foo", "2": "dog"}'),
json.loads(wc_att)) json.loads(wc_att))
self.assertEqual('status:SUCCESS reason:cat', ret) self.assertEqual('status:SUCCESS reason:cat', ret)
self.m.VerifyAll() mock_get_status.assert_called_once()
def test_data_nodata(self): def test_data_nodata(self):
rsrc, handle = self._create_heat_wc_and_handle() rsrc, handle, mock_get_status = self._create_heat_wc_and_handle()
ret = handle.handle_signal() ret = handle.handle_signal()
expected = 'status:SUCCESS reason:Signal 1 received' expected = 'status:SUCCESS reason:Signal 1 received'
self.assertEqual(expected, ret) self.assertEqual(expected, ret)
@ -334,10 +316,10 @@ class HeatWaitConditionTest(common.HeatTestCase):
wc_att = rsrc.FnGetAtt('data') wc_att = rsrc.FnGetAtt('data')
self.assertEqual(json.loads(u'{"1": null, "2": null}'), self.assertEqual(json.loads(u'{"1": null, "2": null}'),
json.loads(wc_att)) json.loads(wc_att))
self.m.VerifyAll() mock_get_status.assert_called_once()
def test_data_partial_complete(self): def test_data_partial_complete(self):
rsrc, handle = self._create_heat_wc_and_handle() rsrc, handle, mock_get_status = self._create_heat_wc_and_handle()
test_metadata = {'status': 'SUCCESS'} test_metadata = {'status': 'SUCCESS'}
ret = handle.handle_signal(details=test_metadata) ret = handle.handle_signal(details=test_metadata)
expected = 'status:SUCCESS reason:Signal 1 received' expected = 'status:SUCCESS reason:Signal 1 received'
@ -352,13 +334,12 @@ class HeatWaitConditionTest(common.HeatTestCase):
wc_att = rsrc.FnGetAtt('data') wc_att = rsrc.FnGetAtt('data')
self.assertEqual(json.loads(u'{"1": null, "2": null}'), self.assertEqual(json.loads(u'{"1": null, "2": null}'),
json.loads(wc_att)) json.loads(wc_att))
self.m.VerifyAll() mock_get_status.assert_called_once()
def _create_heat_handle(self, def _create_heat_handle(self,
template=test_template_heat_waithandle_token): template=test_template_heat_waithandle_token):
self.stack = self.create_stack(template=template, stub_status=False) self.stack = self.create_stack(template=template, stub_status=False)
self.m.ReplayAll()
self.stack.create() self.stack.create()
handle = self.stack['wait_handle'] handle = self.stack['wait_handle']
@ -377,7 +358,6 @@ class HeatWaitConditionTest(common.HeatTestCase):
md_expected = {'1': {'data': None, 'reason': 'Signal 1 received', md_expected = {'1': {'data': None, 'reason': 'Signal 1 received',
'status': 'SUCCESS'}} 'status': 'SUCCESS'}}
self.assertEqual(md_expected, handle.metadata_get()) self.assertEqual(md_expected, handle.metadata_get())
self.m.VerifyAll()
def test_get_status_partial_complete(self): def test_get_status_partial_complete(self):
handle = self._create_heat_handle() handle = self._create_heat_handle()
@ -390,8 +370,6 @@ class HeatWaitConditionTest(common.HeatTestCase):
'status': 'SUCCESS'}} 'status': 'SUCCESS'}}
self.assertEqual(md_expected, handle.metadata_get()) self.assertEqual(md_expected, handle.metadata_get())
self.m.VerifyAll()
def test_get_status_failure(self): def test_get_status_failure(self):
handle = self._create_heat_handle() handle = self._create_heat_handle()
test_metadata = {'status': 'FAILURE'} test_metadata = {'status': 'FAILURE'}
@ -403,33 +381,24 @@ class HeatWaitConditionTest(common.HeatTestCase):
'status': 'FAILURE'}} 'status': 'FAILURE'}}
self.assertEqual(md_expected, handle.metadata_get()) self.assertEqual(md_expected, handle.metadata_get())
self.m.VerifyAll()
def test_getatt_token(self): def test_getatt_token(self):
handle = self._create_heat_handle() handle = self._create_heat_handle()
self.assertEqual('adomainusertoken', handle.FnGetAtt('token')) self.assertEqual('adomainusertoken', handle.FnGetAtt('token'))
self.m.VerifyAll()
def test_getatt_endpoint(self): def test_getatt_endpoint(self):
self.m.StubOutWithMock(heat_plugin.HeatClientPlugin, 'get_heat_url') self.patchobject(heat_plugin.HeatClientPlugin, 'get_heat_url',
heat_plugin.HeatClientPlugin.get_heat_url().AndReturn( return_value='foo/%s' % self.tenant_id)
'foo/%s' % self.tenant_id)
self.m.ReplayAll()
handle = self._create_heat_handle() handle = self._create_heat_handle()
expected = ('foo/aprojectid/stacks/test_stack/%s/resources/' expected = ('foo/aprojectid/stacks/test_stack/%s/resources/'
'wait_handle/signal' 'wait_handle/signal'
% self.stack_id) % self.stack_id)
self.assertEqual(expected, handle.FnGetAtt('endpoint')) self.assertEqual(expected, handle.FnGetAtt('endpoint'))
self.m.VerifyAll()
def test_getatt_curl_cli(self): def test_getatt_curl_cli(self):
self.m.StubOutWithMock(heat_plugin.HeatClientPlugin, 'get_heat_url') self.patchobject(heat_plugin.HeatClientPlugin, 'get_heat_url',
heat_plugin.HeatClientPlugin.get_heat_url().AndReturn( return_value='foo/%s' % self.tenant_id)
'foo/%s' % self.tenant_id) self.patchobject(heat_plugin.HeatClientPlugin, 'get_insecure_option',
self.m.StubOutWithMock( return_value=False)
heat_plugin.HeatClientPlugin, 'get_insecure_option')
heat_plugin.HeatClientPlugin.get_insecure_option().AndReturn(False)
self.m.ReplayAll()
handle = self._create_heat_handle() handle = self._create_heat_handle()
expected = ("curl -i -X POST -H 'X-Auth-Token: adomainusertoken' " expected = ("curl -i -X POST -H 'X-Auth-Token: adomainusertoken' "
"-H 'Content-Type: application/json' " "-H 'Content-Type: application/json' "
@ -437,16 +406,12 @@ class HeatWaitConditionTest(common.HeatTestCase):
"foo/aprojectid/stacks/test_stack/%s/resources/wait_handle" "foo/aprojectid/stacks/test_stack/%s/resources/wait_handle"
"/signal" % self.stack_id) "/signal" % self.stack_id)
self.assertEqual(expected, handle.FnGetAtt('curl_cli')) self.assertEqual(expected, handle.FnGetAtt('curl_cli'))
self.m.VerifyAll()
def test_getatt_curl_cli_insecure_true(self): def test_getatt_curl_cli_insecure_true(self):
self.m.StubOutWithMock(heat_plugin.HeatClientPlugin, 'get_heat_url') self.patchobject(heat_plugin.HeatClientPlugin, 'get_heat_url',
heat_plugin.HeatClientPlugin.get_heat_url().AndReturn( return_value='foo/%s' % self.tenant_id)
'foo/%s' % self.tenant_id) self.patchobject(heat_plugin.HeatClientPlugin, 'get_insecure_option',
self.m.StubOutWithMock( return_value=True)
heat_plugin.HeatClientPlugin, 'get_insecure_option')
heat_plugin.HeatClientPlugin.get_insecure_option().AndReturn(True)
self.m.ReplayAll()
handle = self._create_heat_handle() handle = self._create_heat_handle()
expected = ( expected = (
"curl --insecure -i -X POST -H 'X-Auth-Token: adomainusertoken' " "curl --insecure -i -X POST -H 'X-Auth-Token: adomainusertoken' "
@ -455,7 +420,6 @@ class HeatWaitConditionTest(common.HeatTestCase):
"foo/aprojectid/stacks/test_stack/%s/resources/wait_handle" "foo/aprojectid/stacks/test_stack/%s/resources/wait_handle"
"/signal" % self.stack_id) "/signal" % self.stack_id)
self.assertEqual(expected, handle.FnGetAtt('curl_cli')) self.assertEqual(expected, handle.FnGetAtt('curl_cli'))
self.m.VerifyAll()
def test_getatt_signal_heat(self): def test_getatt_signal_heat(self):
handle = self._create_heat_handle( handle = self._create_heat_handle(
@ -472,9 +436,6 @@ class HeatWaitConditionTest(common.HeatTestCase):
self.assertIn('domain_id', signal) self.assertIn('domain_id', signal)
def test_getatt_signal_swift(self): def test_getatt_signal_swift(self):
self.m.StubOutWithMock(swift_plugin.SwiftClientPlugin, 'get_temp_url')
self.m.StubOutWithMock(swift_plugin.SwiftClientPlugin, 'client')
class mock_swift(object): class mock_swift(object):
@staticmethod @staticmethod
def put_container(container, **kwargs): def put_container(container, **kwargs):
@ -484,15 +445,11 @@ class HeatWaitConditionTest(common.HeatTestCase):
def put_object(container, object, contents, **kwargs): def put_object(container, object, contents, **kwargs):
pass pass
swift_plugin.SwiftClientPlugin.client().AndReturn(mock_swift) mock_tempurl = self.patchobject(swift_plugin.SwiftClientPlugin,
swift_plugin.SwiftClientPlugin.client().AndReturn(mock_swift) 'get_temp_url',
swift_plugin.SwiftClientPlugin.client().AndReturn(mock_swift) return_value='foo')
swift_plugin.SwiftClientPlugin.get_temp_url(mox.IgnoreArg(), self.patchobject(swift_plugin.SwiftClientPlugin, 'client',
mox.IgnoreArg(), return_value=mock_swift)
mox.IgnoreArg()
).AndReturn('foo')
self.m.ReplayAll()
handle = self._create_heat_handle( handle = self._create_heat_handle(
template=test_template_heat_waithandle_swift) template=test_template_heat_waithandle_swift)
@ -501,6 +458,7 @@ class HeatWaitConditionTest(common.HeatTestCase):
self.assertIsNone(handle.FnGetAtt('curl_cli')) self.assertIsNone(handle.FnGetAtt('curl_cli'))
signal = json.loads(handle.FnGetAtt('signal')) signal = json.loads(handle.FnGetAtt('signal'))
self.assertIn('alarm_url', signal) self.assertIn('alarm_url', signal)
mock_tempurl.assert_called_once()
@mock.patch('zaqarclient.queues.v2.queues.Queue.signed_url') @mock.patch('zaqarclient.queues.v2.queues.Queue.signed_url')
def test_getatt_signal_zaqar(self, mock_signed_url): def test_getatt_signal_zaqar(self, mock_signed_url):
@ -528,7 +486,6 @@ class HeatWaitConditionTest(common.HeatTestCase):
def test_create_update_updatehandle(self): def test_create_update_updatehandle(self):
self.stack = self.create_stack( self.stack = self.create_stack(
template=test_template_update_waithandle, stub_status=False) template=test_template_update_waithandle, stub_status=False)
self.m.ReplayAll()
self.stack.create() self.stack.create()
handle = self.stack['update_wait_handle'] handle = self.stack['update_wait_handle']