From 62bb92d4ef59681402a1e3b0b778ef07047bdec2 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Sun, 19 Aug 2018 11:47:06 +0300 Subject: [PATCH] NSX|V Fix policy security group update Updating the policy of the security group was not reflected in the DB Change-Id: I83ce48404722df67daa00e3df703c6902a5ef84d --- vmware_nsx/db/extended_security_group.py | 9 +++++---- .../tests/unit/extensions/test_security_group_policy.py | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/vmware_nsx/db/extended_security_group.py b/vmware_nsx/db/extended_security_group.py index a836ef6335..5144a32fd9 100644 --- a/vmware_nsx/db/extended_security_group.py +++ b/vmware_nsx/db/extended_security_group.py @@ -152,11 +152,12 @@ class ExtendedSecurityGroupPropertiesMixin(object): (sg_policy.POLICY in sg_req and (sg_req[sg_policy.POLICY] != sg_res.get(sg_policy.POLICY)))): - prop = self._get_security_group_properties(context, sg_res['id']) with db_api.context_manager.writer.using(context): - prop.update({ - sg_logging.LOGGING: sg_req.get(sg_logging.LOGGING, False), - sg_policy.POLICY: sg_req.get(sg_policy.POLICY)}) + prop = context.session.query( + NsxExtendedSecurityGroupProperties).filter_by( + security_group_id=sg_res['id']).one() + prop.logging = sg_req.get(sg_logging.LOGGING, False) + prop.policy = sg_req.get(sg_policy.POLICY) sg_res[sg_logging.LOGGING] = sg_req.get(sg_logging.LOGGING, False) sg_res[sg_policy.POLICY] = sg_req.get(sg_policy.POLICY) diff --git a/vmware_nsx/tests/unit/extensions/test_security_group_policy.py b/vmware_nsx/tests/unit/extensions/test_security_group_policy.py index 8eabdf4854..d6e3e5dab6 100644 --- a/vmware_nsx/tests/unit/extensions/test_security_group_policy.py +++ b/vmware_nsx/tests/unit/extensions/test_security_group_policy.py @@ -110,6 +110,11 @@ class SecGroupPolicyExtensionTestCase( sg['security_group']['id']) updated_sg = self.deserialize(self.fmt, req.get_response(self.ext_api)) self.assertEqual(new_policy, updated_sg['security_group']['policy']) + # Verify the same result in 'get' + req = self.new_show_request('security-groups', + sg['security_group']['id']) + shown_sg = self.deserialize(self.fmt, req.get_response(self.ext_api)) + self.assertEqual(new_policy, shown_sg['security_group']['policy']) def test_secgroup_update_no_policy_change(self): # Test updating without changing the policy