commit b1ca1a25a61892ccb42e73712ffc606c1520eca9
author Jian Li <pyguni@gmail.com> Fri Jul 06 13:31:39 2018 +0900
committer Jian Li <pyguni@gmail.com> Fri Jul 06 14:31:42 2018 +0900
tree 1911957fc8abc29a4524dfbae794715933279789
parent 26ef130ed7e8c844f9176dedc85530c90596c7b6

Init and purge rules/group table during vtap app start and stop

Change-Id: I1382cf5ba1f74ce2c4251a41a9cc956ddb0712f1

apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DistributedOpenstackVtapStore.java

diff --git a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DistributedOpenstackVtapStore.java b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DistributedOpenstackVtapStore.java
index c90571f..141af0b 100644
--- a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DistributedOpenstackVtapStore.java
+++ b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DistributedOpenstackVtapStore.java
@@ -383,10 +383,14 @@
                                                  DeviceId deviceId) {
         Set<OpenstackVtapId> vtapIds = Sets.newHashSet();
         if (type.isValid(OpenstackVtap.Type.VTAP_TX)) {
-            vtapIds.addAll(vTapIdsByTxDeviceId.get(deviceId));
+            if (vTapIdsByTxDeviceId.get(deviceId) != null) {
+                vtapIds.addAll(vTapIdsByTxDeviceId.get(deviceId));
+            }
         }
         if (type.isValid(OpenstackVtap.Type.VTAP_RX)) {
-            vtapIds.addAll(vTapIdsByRxDeviceId.get(deviceId));
+            if (vTapIdsByRxDeviceId.get(deviceId) != null) {
+                vtapIds.addAll(vTapIdsByRxDeviceId.get(deviceId));
+            }
         }
 
         return ImmutableSet.copyOf(