From e8292f69cc77ec05b225086bc2bb706a28aa781d Mon Sep 17 00:00:00 2001 From: Thomas Bachman Date: Tue, 16 Jun 2015 07:18:23 -0400 Subject: [PATCH] Bug 3745: Fix for null tunnel port. This fixes a bug where a list in an augmentation is set to null, causing an IllegalArgumentExcpetion. Change-Id: Ie183a97555216a2fb0538a5356941d71265bfd58 Signed-off-by: Thomas Bachman --- .../neutron/ovsdb/util/InventoryHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 7498c61cd..7ec29c096 100755 --- 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(existingTunnels)).build(); + if (!existingTunnels.isEmpty()) { + ofOverlayNodeConfigBuilder.setTunnel(new ArrayList(existingTunnels)); + } + OfOverlayNodeConfig newConfig = ofOverlayNodeConfigBuilder.build(); if (addOfOverlayAugmentation(newConfig, nodeIdString, dataBroker)) { LOG.trace("updateOfOverlayConfig - Added Tunnel: {} to Node: {} at NodeConnector: {}",tunnelBuilder.build(), nodeIdString, nodeConnectorIdString); return; -- 2.36.6