x/vmware-nsx
Code Issues Proposed changes

NSX|P: Fix fwaas rules update

Browse Source 
Adding categotry to the call as it is mandatory.

Change-Id: I9b59a29566728052d3e5ba274ca6063edbcc8024
This commit is contained in:
Adit Sarfaty 2019-04-28 09:47:39 +03:00
parent eb3593171a
commit ede950ffb5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vmware_nsx/services/fwaas/nsx_p/fwaas_callbacks_v2.py
View File

@ -375,7 +375,8 @@ class NsxpFwaasCallbacksV2(com_callbacks.NsxCommonv3FwaasCallbacksV2):
else:
# only update the rules of this policy
self.nsxpolicy.gateway_policy.update_entries(
policy_constants.DEFAULT_DOMAIN, router_id, fw_rules)
policy_constants.DEFAULT_DOMAIN, router_id, fw_rules,
category=policy_constants.CATEGORY_LOCAL_GW)
return
tags = self.nsxpolicy.build_v3_tags_payload(

12
vmware_nsx/tests/unit/nsx_p/test_fwaas_v2_driver.py
View File

@ -250,7 +250,8 @@ class NsxpFwaasTestCase(test_p_plugin.NsxPPluginTestCaseMixin):
expected_rules = (self._block_interface_rules(0) +
[self._default_rule(2)])
update_fw.assert_called_once_with(
policy_constants.DEFAULT_DOMAIN, FAKE_ROUTER_ID, mock.ANY)
policy_constants.DEFAULT_DOMAIN, FAKE_ROUTER_ID, mock.ANY,
category=policy_constants.CATEGORY_LOCAL_GW)
# compare rules one by one
actual_rules = update_fw.call_args[0][2]
self.assertEqual(len(expected_rules), len(actual_rules))
@ -279,7 +280,8 @@ class NsxpFwaasTestCase(test_p_plugin.NsxPPluginTestCaseMixin):
expected_default_rules = self._block_interface_rules(
len(rule_list)) + [self._default_rule(len(rule_list) + 2)]
update_fw.assert_called_once_with(
policy_constants.DEFAULT_DOMAIN, FAKE_ROUTER_ID, mock.ANY)
policy_constants.DEFAULT_DOMAIN, FAKE_ROUTER_ID, mock.ANY,
category=policy_constants.CATEGORY_LOCAL_GW)
# compare rules one by one
actual_rules = update_fw.call_args[0][2]
@ -341,7 +343,8 @@ class NsxpFwaasTestCase(test_p_plugin.NsxPPluginTestCaseMixin):
# expecting only the default allow-all rule
expected_rules = [self._default_rule(0)]
update_fw.assert_called_once_with(
policy_constants.DEFAULT_DOMAIN, FAKE_ROUTER_ID, mock.ANY)
policy_constants.DEFAULT_DOMAIN, FAKE_ROUTER_ID, mock.ANY,
category=policy_constants.CATEGORY_LOCAL_GW)
# compare rules one by one
actual_rules = update_fw.call_args[0][2]
self.assertEqual(len(expected_rules), len(actual_rules))
@ -363,7 +366,8 @@ class NsxpFwaasTestCase(test_p_plugin.NsxPPluginTestCaseMixin):
# expecting only the default allow-all rule
expected_rules = [self._default_rule(0)]
update_fw.assert_called_once_with(
policy_constants.DEFAULT_DOMAIN, FAKE_ROUTER_ID, mock.ANY)
policy_constants.DEFAULT_DOMAIN, FAKE_ROUTER_ID, mock.ANY,
category=policy_constants.CATEGORY_LOCAL_GW)
# compare rules one by one
actual_rules = update_fw.call_args[0][2]
self.assertEqual(len(expected_rules), len(actual_rules))