rootNode.getDataAfter() return null instead of emptylist

After Neon MRI version bump, on a node removal, rootNode.getDataAfter()
is returning null instead of empty list, and hence requires a change
in service-binding logic of GENIUS

JIRA: TSC-179
Change-Id: I098fed50647268b70469b7097b3979d2424f8a0f
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigUnbindHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigUnbindHelper.java
index d76801c7106037e981acf4defbff8c6f824e2e07..6f00aeaf4464583660572fa65cd96620de255766 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigUnbindHelper.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigUnbindHelper.java
@@ -63,7 +63,7 @@ public class FlowBasedIngressServicesConfigUnbindHelper extends AbstractFlowBase
                 boundServicesState.getInterfaceName());
         futures.add(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> {
             BigInteger dpId = boundServicesState.getDpid();
-            if (boundServices.isEmpty()) {
+            if (boundServices == null || boundServices.isEmpty()) {
                 // Remove default entry from Lport Dispatcher Table.
                 FlowBasedServicesUtils.removeLPortDispatcherFlow(dpId, boundServicesState.getInterfaceName(),
                         boundServiceOld, tx, NwConstants.DEFAULT_SERVICE_INDEX);

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesConfigListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesConfigListener.java
index b9fba4b9950a4a000784d080a111e0d2426148b8..2c4ff5a9a0787e541fedf94544674a6c4ddd9ff6 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesConfigListener.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesConfigListener.java
@@ -299,7 +299,7 @@ public class FlowBasedServicesConfigListener implements ClusteredDataTreeChangeL
                             boundServicesNew.getServiceName(), boundServicesNew.getServicePriority());
                     return;
                 }
-                if (boundServicesList.isEmpty()) {
+                if (boundServicesList == null || boundServicesList.isEmpty()) {
                     FlowBasedServicesUtils.removeBoundServicesState(tx, interfaceName, serviceMode);
                 }
                 flowBasedServicesConfigRemovable.unbindService(futures, interfaceName, boundServicesNew,