Fixes Bug 5187

remote security group will continue the addition/deletion of rules after
logging if not found in cache.

Change-Id: Ic6129b0e8884a185e0907789de66a5df3eee39c0
Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
index 889e9c52b3c83b78053fd1ca363a30240200780f..f7b68bb1c919e56c338fb425b08e1fd04eaaae16 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
@@ -87,6 +87,7 @@ public class SecurityGroupCacheManagerImpl implements ConfigInterface, SecurityG
         LOG.debug("In removeFromCache remoteSgUuid:" + remoteSgUuid + " portUuid:" + portUuid);
         Set<String> portList = securityGroupCache.get(remoteSgUuid);
         if (null == portList) {
+            LOG.debug("The port list is empty for security group:" + remoteSgUuid);
             return;
         }
         for (Iterator<String> iterator = portList.iterator(); iterator.hasNext();) {
@@ -109,6 +110,7 @@ public class SecurityGroupCacheManagerImpl implements ConfigInterface, SecurityG
         LOG.debug("In processPortAdded securityGroupUuid:" + securityGroupUuid + " NeutronPort:" + port);
         Set<String> portList = this.securityGroupCache.get(securityGroupUuid);
         if (null == portList) {
+            LOG.debug("The port list is empty for security group:" + securityGroupUuid);
             return;
         }
         for (String cachedportUuid : portList) {
@@ -119,7 +121,7 @@ public class SecurityGroupCacheManagerImpl implements ConfigInterface, SecurityG
             if (null == cachedport) {
                 LOG.error("In processPortAdded cachedport port not found in neuton cache:"
                             + " cachedportUuid:" + cachedportUuid);
-                return;
+                continue;
             }
             List<NeutronSecurityRule> remoteSecurityRules = retrieveSecurityRules(securityGroupUuid, cachedportUuid);
             for (NeutronSecurityRule securityRule : remoteSecurityRules) {
@@ -141,6 +143,7 @@ public class SecurityGroupCacheManagerImpl implements ConfigInterface, SecurityG
         LOG.debug("In processPortRemoved securityGroupUuid:" + securityGroupUuid + " port:" + port);
         Set<String> portList = this.securityGroupCache.get(securityGroupUuid);
         if (null == portList) {
+            LOG.debug("The port list is empty for security group:" + securityGroupUuid);
             return;
         }
         for (String cachedportUuid : portList) {
@@ -153,7 +156,7 @@ public class SecurityGroupCacheManagerImpl implements ConfigInterface, SecurityG
                 if (null == cachedport) {
                     LOG.error("In processPortRemoved cachedport port not found in neuton cache:"
                                 + " cachedportUuid:" + cachedportUuid);
-                    return;
+                    continue;
                 }
             }
             List<NeutronSecurityRule> remoteSecurityRules = retrieveSecurityRules(securityGroupUuid, cachedportUuid);