Bug 3745: Fix for null tunnel port.

[groupbasedpolicy.git] / neutron-ovsdb / src / main / java / org / opendaylight / groupbasedpolicy / neutron / ovsdb / util / InventoryHelper.java

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java
index 7498c61cdc87545f6292e3d6284fffa320c992b8..7ec29c0961cee178a28cd3666a0a927050e7fca9 100755 (executable)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java
@@ -256,6 +256,7 @@ public class InventoryHelper {
                 tunnelBuilder.setIp(ip);
                 tunnelBuilder.setPort(tunnelType.getPortNumber());
                 tunnelBuilder.setNodeConnectorId(nodeConnectorId);
+                tunnelBuilder.setTunnelType(tunnelType.getTunnelType());
                 tunnelFound = true;
                 tunnelsUpdated = true;
                 break;
@@ -278,7 +279,10 @@ public class InventoryHelper {
         existingTunnels.add(tunnelBuilder.build());
 
         // Update the OfOverlayNodeConfig with the new tunnel information
-        OfOverlayNodeConfig newConfig=ofOverlayNodeConfigBuilder.setTunnel(new ArrayList<Tunnel>(existingTunnels)).build();
+        if (!existingTunnels.isEmpty()) {
+            ofOverlayNodeConfigBuilder.setTunnel(new ArrayList<Tunnel>(existingTunnels));
+        }
+        OfOverlayNodeConfig newConfig = ofOverlayNodeConfigBuilder.build();
         if (addOfOverlayAugmentation(newConfig, nodeIdString, dataBroker)) {
             LOG.trace("updateOfOverlayConfig - Added Tunnel: {} to Node: {} at NodeConnector: {}",tunnelBuilder.build(), nodeIdString, nodeConnectorIdString);
             return;