Net-odl full-sync. Set router ext gw MAC

During full-sync networking-odl syncs routers before ports. As such,
the MAC of the router's gw port is not available to be set when the
internal netvirt router is written to md-sal. This commit adds logic
to update the router when the port is written.

Change-Id: Ic6b78f77a8352416d3260678dcd6624e2fcf8d68
Signed-off-by: Josh <jhershbe@redhat.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 91f295d021f09f17e27db41374f9d18d646d6ec7..d9aab7205a29a8d4bbbe0c512e2c31f213ecac5e 100644 (file)
--- 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
@@ -49,6 +49,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterfaceBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterfaceKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.elan._interface.StaticMacEntries;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.Routers;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.RoutersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.floating.ip.port.info.FloatingIpIdToPortMappingBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.floating.ip.port.info.FloatingIpIdToPortMappingKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.subnetmaps.Subnetmap;
@@ -365,6 +367,28 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
             return;
         }
         gwMacResolver.sendArpRequestsToExtGateways(router);
+
+        setExternalGwMac(routerGwPort, routerId);
+    }
+
+    private void setExternalGwMac(Port routerGwPort, Uuid routerId) {
+        // During full-sync networking-odl syncs routers before ports. As such,
+        // the MAC of the router's gw port is not available to be set when the
+        // router is written. We catch that here.
+        InstanceIdentifier<Routers> routersId = NeutronvpnUtils.buildExtRoutersIdentifier(routerId);
+        Optional<Routers> optionalRouter = MDSALUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, routersId);
+        if (!optionalRouter.isPresent()) {
+            return;
+        }
+
+        Routers extRouters = optionalRouter.get();
+        if (extRouters.getExtGwMacAddress() != null) {
+            return;
+        }
+
+        RoutersBuilder builder = new RoutersBuilder(extRouters);
+        builder.setExtGwMacAddress(routerGwPort.getMacAddress().getValue());
+        MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, routersId, builder.build());
     }
 
     private void handleNeutronPortCreated(final Port port) {