From 7ea111d161c28dd424340b18fe0b4a10f9c0c502 Mon Sep 17 00:00:00 2001
From: Flavio Fernandes <ffernand@redhat.com>
Date: Wed, 27 May 2015 12:02:19 -0400
Subject: [PATCH] Bug 2991: Handle cases when neutron network has no
 segmentationId

External networks have no tenant segmentation id. Because of that, code
must not assume that field is non-null.

Change-Id: Ifaebe02c76c1a769cee79f54e11233dae2dcce6d
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
---
 .../openstack/netvirt/impl/TenantNetworkManagerImpl.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java
index 2e701984f..53f9d0623 100644
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java
@@ -99,7 +99,10 @@ public class TenantNetworkManagerImpl implements ConfigInterface, TenantNetworkM
         Preconditions.checkNotNull(neutronNetworkCache);
         List <NeutronNetwork> networks = neutronNetworkCache.getAllNetworks();
         for (NeutronNetwork network : networks) {
-            if (network.getProviderSegmentationID().equalsIgnoreCase(segmentationId)) return network.getNetworkUUID();
+            if (network.getProviderSegmentationID() != null &&
+                    network.getProviderSegmentationID().equalsIgnoreCase(segmentationId)) {
+                return network.getNetworkUUID();
+            }
         }
         return null;
     }
-- 
2.36.6