openstack/openstacksdk
Code Issues Proposed changes

Merge "Stop mocking method in fwaas test"

Browse Source
This commit is contained in:
Zuul 2019-02-22 18:25:46 +00:00 committed by Gerrit Code Review
commit 79effadf07
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openstack/tests/unit/cloud/test_fwaas.py
View File

@ -226,25 +226,28 @@ class TestFirewallRule(FirewallTestCase):
filters = {'project_id': self.mock_firewall_rule['project_id']} filters = {'project_id': self.mock_firewall_rule['project_id']}
updated = self.mock_firewall_rule.copy() updated = self.mock_firewall_rule.copy()
updated.update(params) updated.update(params)
_find = self.cloud.network.find_firewall_rule updated_dict = self._mock_firewall_rule_attrs.copy()
self.cloud.network.find_firewall_rule = Mock( updated_dict.update(params)
return_value=self.mock_firewall_rule)
self.register_uris([ self.register_uris([
dict(method='PUT', dict(
uri=self._make_mock_url('firewall_rules', method='GET',
self.firewall_rule_id), uri=self._make_mock_url(
json={'firewall_rule': updated}) 'firewall_rules', self.firewall_rule_name),
json={'firewall_rule': self._mock_firewall_rule_attrs}),
dict(
method='PUT',
uri=self._make_mock_url(
'firewall_rules', self.firewall_rule_id),
json={'firewall_rule': updated_dict},
validate={
'json': {'firewall_rule': params},
})
]) ])
self.assertDictEqual(updated, updated_rule = self.cloud.update_firewall_rule(
self.cloud.update_firewall_rule( self.firewall_rule_name, filters, **params)
self.firewall_rule_name, filters, **params)) self.assertDictEqual(updated, updated_rule)
self.assert_calls() self.assert_calls()
self.cloud.network.find_firewall_rule.assert_called_once_with(
self.firewall_rule_name, ignore_missing=False, **filters)
# restore
self.cloud.network.find_firewall_rule = _find
class TestFirewallPolicy(FirewallTestCase): class TestFirewallPolicy(FirewallTestCase):
firewall_policy_id = '78d05d20-d406-41ec-819d-06b65c2684e4' firewall_policy_id = '78d05d20-d406-41ec-819d-06b65c2684e4'