x/vmware-nsxlib
Code Issues Proposed changes

Revert "Improve security policy update rules with transactions"

Browse Source 
This reverts commit 3ddc9e865c.

Change-Id: I512067a33abaf61f7ff98b878adf6307724bfd44
This commit is contained in:
Adit Sarfaty
2020-07-16 03:03:28 +00:00
parent 3ddc9e865c
commit 877c2aa252
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vmware_nsxlib/tests/unit/v3/policy/test_transaction.py
View File

@@ -456,7 +456,10 @@ class TestPolicyTransaction(policy_testcase.TestPolicyApi):
dfw_rule1['display_name'] = new_rule_name
dfw_rule1['direction'] = new_direction
security_policy['rules'] = copy.deepcopy([dfw_rule1, dfw_rule2])
child_rules = [{'resource_type': 'ChildRule', 'Rule': dfw_rule1},
{'resource_type': 'ChildRule', 'Rule': dfw_rule2,
'marked_for_delete': True}]
security_policy.update({'children': child_rules})
child_security_policies = [{
'resource_type': 'ChildSecurityPolicy',
'SecurityPolicy': security_policy

8
vmware_nsxlib/v3/policy/core_resources.py
View File

@@ -3626,13 +3626,7 @@ class NsxPolicySecurityPolicyBaseApi(NsxPolicyResourceBase):
map_def.set_obj_dict(comm_map)
# Update the entire map at the NSX
if transaction:
if not ignore_entries:
# Add the rules under the map and not as ChileRules for
# improved performance on the NSX side
comm_map['rules'] = [rule.get_obj_dict() for rule in
replaced_entries]
map_def.set_obj_dict(comm_map)
self._create_or_store(map_def)
self._create_or_store(map_def, replaced_entries)
else:
body = map_def.get_obj_dict()
if not ignore_entries: