From: Yakir Dorani <yakir.dorani@hpe.com>
Date: Thu, 6 Apr 2017 08:52:51 +0000 (+0300)
Subject: Bug 8166: Acl interfaces are not set and cached correctly
X-Git-Tag: release/nitrogen~341
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F54409%2F6;p=netvirt.git

Bug 8166: Acl interfaces are not set and cached correctly

The acl interface can exist in the cache before an interface
was assigned one. This can happen via the AclInterfaceStateListener.
Also, an interface ID should be set when a new entry is created.

Change-Id: I3e882582731eb273da533ac15dd2c8cc7f27ffe2
Signed-off-by: Yakir Dorani <yakir.dorani@hpe.com>
---

diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java
index f92cc82f69..0920ce0f5b 100644
--- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java
@@ -83,13 +83,13 @@ public class AclInterfaceListener extends AsyncDataTreeChangeListenerBase<Interf
         if (aclInPortAfter != null && aclInPortAfter.isPortSecurityEnabled()
                 || aclInPortBefore != null && aclInPortBefore.isPortSecurityEnabled()) {
             String interfaceId = portAfter.getName();
-            AclInterface aclInterface = null;
-            if (aclInPortBefore == null) {
-                aclInterface = addAclInterfaceToCache(interfaceId, aclInPortAfter);
+            AclInterface aclInterface = AclInterfaceCacheUtil.getAclInterfaceFromCache(interfaceId);
+            if (aclInterface != null) {
+                aclInterface = getOldAclInterfaceObject(aclInterface, aclInPortAfter);
             } else {
-                AclInterface cachedAclInterface = AclInterfaceCacheUtil.getAclInterfaceFromCache(interfaceId);
-                aclInterface = getOldAclInterfaceObject(cachedAclInterface, aclInPortAfter);
+                aclInterface = addAclInterfaceToCache(interfaceId, aclInPortAfter);
             }
+
             AclInterface oldAclInterface = getOldAclInterfaceObject(aclInterface, aclInPortBefore);
             List<Uuid> deletedAclList = AclServiceUtils.getUpdatedAclList(oldAclInterface.getSecurityGroups(),
                     aclInterface.getSecurityGroups());
diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java
index 54e5ffc0a6..0fe9bcfc9e 100644
--- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java
@@ -114,6 +114,7 @@ public class AclInterfaceStateListener extends AsyncDataTreeChangeListenerBase<I
         AclInterface aclInterface = AclInterfaceCacheUtil.getAclInterfaceFromCache(interfaceId);
         if (aclInterface == null) {
             aclInterface = new AclInterface();
+            aclInterface.setInterfaceId(interfaceId);
             AclInterfaceCacheUtil.addAclInterfaceToCache(interfaceId, aclInterface);
         }
         aclInterface.setDpId(AclServiceUtils.getDpIdFromIterfaceState(dataObjectModification));