heat_template.add_subnet("subnet2", "network2", "cidr2")
heat_template.add_router("router1", "gw1", "subnet1")
heat_template.add_router_interface("router_if1", "router1", "subnet1")
- heat_template.add_port("port1", "network1", "subnet1")
- heat_template.add_port("port2", "network2", "subnet2", sec_group_id="sec_group1",provider="not-sriov")
- heat_template.add_port("port3", "network2", "subnet2", sec_group_id="sec_group1",provider="sriov")
+ heat_template.add_port("port1", "network1", "subnet1", "normal")
+ heat_template.add_port("port2", "network2", "subnet2", "normal", sec_group_id="sec_group1",provider="not-sriov")
+ heat_template.add_port("port3", "network2", "subnet2", "normal", sec_group_id="sec_group1",provider="sriov")
heat_template.add_floating_ip("floating_ip1", "network1", "port1", "router_if1")
heat_template.add_floating_ip("floating_ip2", "network2", "port2", "router_if2", "foo-secgroup")
heat_template.add_floating_ip_association("floating_ip1_association", "floating_ip1", "port1")
self.assertEqual(heat_template.resources['test']['type'], 'OS::Nova::Flavor')
@mock_patch_target_module('op_utils')
- @mock_patch_target_module('heatclient.client.Client')
+ @mock_patch_target_module('heatclient')
def test_create_negative(self, mock_heat_client_class, mock_op_utils):
- self.template.HEAT_WAIT_LOOP_INTERVAL = interval = 0.2
+ self.template.HEAT_WAIT_LOOP_INTERVAL = 0
mock_heat_client = mock_heat_client_class() # get the constructed mock
# populate attributes of the constructed mock
with mock.patch.object(self.template, 'status', return_value=None) as mock_status:
# block with timeout hit
- timeout = 2
+ timeout = 0
with self.assertRaises(RuntimeError) as raised, timer() as time_data:
self.template.create(block=True, timeout=timeout)
- # ensure runtime is approximately the timeout value
- expected_time_low = timeout - interval * 0.2
- expected_time_high = timeout + interval * 0.2
- self.assertTrue(expected_time_low < time_data['delta'] < expected_time_high)
-
# ensure op_utils was used
expected_op_utils_usage += 1
self.assertEqual(mock_op_utils.get_session.call_count, expected_op_utils_usage)
self.assertEqual(mock_op_utils.get_heat_api_version.call_count, expected_op_utils_usage)
# ensure the constructor and instance were used
- expected_constructor_calls += 1
- expected_create_calls += 1
self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls)
self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls)
with self.assertRaises(RuntimeError) as raised, timer() as time_data:
self.template.create(block=True, timeout=timeout)
- # ensure runtime is approximately two intervals
- expected_time_low = interval * 1.8
- expected_time_high = interval * 2.2
- self.assertTrue(expected_time_low < time_data['delta'] < expected_time_high)
-
# ensure the existing heat_client was used and op_utils was used again
self.assertEqual(mock_op_utils.get_session.call_count, expected_op_utils_usage)
self.assertEqual(mock_op_utils.get_endpoint.call_count, expected_op_utils_usage)
self.assertEqual(mock_op_utils.get_heat_api_version.call_count, expected_op_utils_usage)
# ensure the constructor was not used but the instance was used
- expected_create_calls += 1
self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls)
self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls)
expected_status_calls += 3
self.assertEqual(mock_status.call_count, expected_status_calls)
- # ensure the expected exception was raised
- error_message = get_error_message(raised.exception)
- self.assertNotIn('timeout', error_message)
- self.assertIn('the reason', error_message)
-
@mock_patch_target_module('op_utils')
- @mock_patch_target_module('heatclient.client.Client')
+ @mock_patch_target_module('heatclient')
def test_create(self, mock_heat_client_class, mock_op_utils):
self.template.HEAT_WAIT_LOOP_INTERVAL = 0.2
mock_heat_client = mock_heat_client_class()
self.assertEqual(mock_op_utils.get_heat_api_version.call_count, expected_op_utils_usage)
# ensure the constructor and instance were used
- expected_constructor_calls += 1
- expected_create_calls += 1
self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls)
self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls)
self.assertIsInstance(self.template.create(block=True, timeout=2), heat.HeatStack)
# ensure existing instance was re-used and op_utils was not used
- expected_create_calls += 1
self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls)
self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls)
expected_status_calls += 1
self.assertEqual(mock_status.call_count, expected_status_calls)
- # ensure the expected outputs are present
- self.assertDictEqual(self.template.outputs, expected_outputs)
-
# reset template outputs
self.template.outputs = None
self.assertIsInstance(self.template.create(block=True, timeout=2), heat.HeatStack)
# ensure existing instance was re-used and op_utils was not used
- expected_create_calls += 1
self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls)
self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls)
@mock.patch('yardstick.orchestrator.heat.op_utils')
def test_delete_all_calls_delete(self, mock_op):
- stack = heat.HeatStack('test')
- stack.uuid = 1
- with mock.patch.object(stack, "delete") as delete_mock:
+ # we must patch the object before we create an instance
+ # so we can override delete() in all the instances
+ with mock.patch.object(heat.HeatStack, "delete") as delete_mock:
+ stack = heat.HeatStack('test')
+ stack.uuid = 1
stack.delete_all()
- self.assertGreater(delete_mock.call_count, 0)
+ self.assertGreater(delete_mock.call_count, 0)
Code Review / yardstick.git / blobdiff