From: Olga Schukin <olga.schukin@hpe.com>
Date: Tue, 13 Dec 2016 05:53:40 +0000 (+0200)
Subject: Bug 7260: no rules in table 26 for default route
X-Git-Tag: release/carbon~560
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=682cbe293647aa9ebf35fc64b5d5a498b1276d64;p=netvirt.git

Bug 7260: no rules in table 26 for default route

* the model of router gateway wasn't written to mdsal due to NPE
* fix the race cond when add router gateway port done after handling ext network for this router

Change-Id: Ide2e5d6bb8e90d1d13effb8456aeaed395c9675a
Signed-off-by: Olga Schukin <olga.schukin@hpe.com>
---

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
index c99fa9dda0..f077aa1144 100644
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
@@ -351,7 +351,7 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
             LOG.warn("No router found for router GW port {} router id {}", routerGwPort.getUuid(), routerId.getValue());
             return;
         }
-
+        nvpnNatManager.addExternalRouter(router, dataBroker);
         gwMacResolver.sendArpRequestsToExtGateways(router);
     }
 
diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java
index d798a53cf5..8596e7029e 100644
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java
@@ -273,7 +273,7 @@ public class NeutronvpnNatManager implements AutoCloseable {
         try {
             Network input = NeutronvpnUtils.getNeutronNetwork(dataBroker, extNetId);
             ProviderTypes providerNwType = NeutronvpnUtils.getProviderNetworkType(input);
-            if(providerNwType == null){
+            if (providerNwType == null) {
                 LOG.error("Unable to get Network Provider Type for network {} and uuid {}", input.getName(), input.getUuid());
                 return;
             }
@@ -413,7 +413,7 @@ public class NeutronvpnNatManager implements AutoCloseable {
         }
     }
 
-    private void addExternalRouter(Router update, DataBroker broker) {
+    public void addExternalRouter(Router update, DataBroker broker) {
         Uuid routerId = update.getUuid();
         Uuid extNetId = update.getExternalGatewayInfo().getExternalNetworkId();
         Uuid gatewayPortId = update.getGatewayPortId();
@@ -426,7 +426,7 @@ public class NeutronvpnNatManager implements AutoCloseable {
         try {
             Network input = NeutronvpnUtils.getNeutronNetwork(dataBroker, extNetId);
             ProviderTypes providerNwType = NeutronvpnUtils.getProviderNetworkType(input);
-            if(providerNwType == null){
+            if (providerNwType == null) {
                 LOG.error("Unable to get Network Provider Type for network {} and uuid{}", input.getName(), input.getUuid());
                 return;
             }
@@ -440,26 +440,20 @@ public class NeutronvpnNatManager implements AutoCloseable {
             } else {
                 builder = new RoutersBuilder().setKey(new RoutersKey(routerId.getValue()));
             }
-            if (builder != null) {
-                builder.setRouterName(routerId.getValue());
-            }
-            if (builder != null) {
-                builder.setNetworkId(extNetId);
-            }
-            if (builder != null) {
-                builder.setEnableSnat(update.getExternalGatewayInfo().isEnableSnat());
-            }
-            if (builder != null) {
-                ArrayList<String> ext_fixed_ips = new ArrayList<String>();
-                for (ExternalFixedIps fixed_ips : update.getExternalGatewayInfo().getExternalFixedIps()) {
-                    ext_fixed_ips.add(fixed_ips.getIpAddress().getIpv4Address().getValue());
-                }
-                builder.setExternalIps(ext_fixed_ips);
+            builder.setRouterName(routerId.getValue());
+            builder.setNetworkId(extNetId);
+            builder.setEnableSnat(update.getExternalGatewayInfo().isEnableSnat());
+
+            ArrayList<String> ext_fixed_ips = new ArrayList<String>();
+            for (ExternalFixedIps fixed_ips : update.getExternalGatewayInfo().getExternalFixedIps()) {
+                ext_fixed_ips.add(fixed_ips.getIpAddress().getIpv4Address().getValue());
             }
+            builder.setExternalIps(ext_fixed_ips);
+
             if (gatewayPortId != null) {
                 LOG.trace("Setting/Updating gateway Mac for router {}", routerId.getValue());
                 Port port = NeutronvpnUtils.getNeutronPort(broker, gatewayPortId);
-                if (port.getDeviceOwner().equals(NeutronConstants.DEVICE_OWNER_GATEWAY_INF)) {
+                if (port != null && port.getDeviceOwner().equals(NeutronConstants.DEVICE_OWNER_GATEWAY_INF)) {
                     builder.setExtGwMacAddress(port.getMacAddress().getValue());
                 }
             }