openstack/rally-openstack
Code Issues Proposed changes

Merge "Mock generate_cidr in unit test"

Browse Source
This commit is contained in:
Jenkins
2016-05-26 15:27:50 +00:00
committed by Gerrit Code Review
parent 815906e14b 542a8a6eec
commit d1cb7aa32c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/unit/plugins/openstack/scenarios/neutron/test_utils.py
View File

@@ -124,9 +124,11 @@ class NeutronScenarioTestCase(test.ScenarioTestCase):
self._test_atomic_action_timer(self.scenario.atomic_actions(), self._test_atomic_action_timer(self.scenario.atomic_actions(),
"neutron.delete_network") "neutron.delete_network")
def test_create_subnet(self): @mock.patch(NEUTRON_UTILS + "network_wrapper")
def test_create_subnet(self, mock_network_wrapper):
network_id = "fake-id" network_id = "fake-id"
start_cidr = "192.168.0.0/24" start_cidr = "192.168.0.0/24"
mock_network_wrapper.generate_cidr.return_value = "192.168.0.0/24"
network = {"network": {"id": network_id}} network = {"network": {"id": network_id}}
expected_subnet_data = { expected_subnet_data = {
@@ -150,6 +152,7 @@ class NeutronScenarioTestCase(test.ScenarioTestCase):
# Custom options # Custom options
extras = {"cidr": "192.168.16.0/24", "allocation_pools": []} extras = {"cidr": "192.168.16.0/24", "allocation_pools": []}
mock_network_wrapper.generate_cidr.return_value = "192.168.16.0/24"
subnet_data.update(extras) subnet_data.update(extras)
expected_subnet_data["subnet"].update(extras) expected_subnet_data["subnet"].update(extras)
self.scenario._create_subnet(network, subnet_data) self.scenario._create_subnet(network, subnet_data)