From 9767d9e7c926c2221e14737f15e2389407c5fbaf Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Thu, 3 Jan 2019 12:42:17 +0200 Subject: [PATCH] Add safty checks when getting port provider securtiy groups If for some reason during update-port the original port does not have the provider security groups attribute, it may fail. Change-Id: Id6af4c714fd3dfd5fe8958b1f061d313c14d0f46 --- vmware_nsx/db/extended_security_group.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vmware_nsx/db/extended_security_group.py b/vmware_nsx/db/extended_security_group.py index 8c47d94fde..4d76e16dfe 100644 --- a/vmware_nsx/db/extended_security_group.py +++ b/vmware_nsx/db/extended_security_group.py @@ -307,7 +307,7 @@ class ExtendedSecurityGroupPropertiesMixin(object): n_constants.ATTR_NOT_SPECIFIED) provider_sg_changed = ( provider_sg_specified and not helpers.compare_elements( - original_port[provider_sg.PROVIDER_SECURITYGROUPS], + original_port.get(provider_sg.PROVIDER_SECURITYGROUPS, []), p[provider_sg.PROVIDER_SECURITYGROUPS])) sg_changed = ( set(original_port[ext_sg.SECURITYGROUPS]) != @@ -322,7 +322,7 @@ class ExtendedSecurityGroupPropertiesMixin(object): self._get_provider_security_groups_on_port(context, port)) else: updated_port[provider_sg.PROVIDER_SECURITYGROUPS] = ( - original_port[provider_sg.PROVIDER_SECURITYGROUPS]) + original_port.get(provider_sg.PROVIDER_SECURITYGROUPS, [])) if provider_sg_changed or sg_changed: if not sg_changed: