Bug 1705: Expect default gateways mac to be provided

Patch 4: Move check to caller of RoutingService::programDefaultRouteEntry()
Patch 5: noop

Change-Id: I115febb115134fb7c7af0d0264700c769c4e95ad
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
index 0965949b378871d4030f91dc1779a6dc98b55ec4..e596b31a0f182873f849d7895313d85651306d35 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
@@ -671,6 +671,13 @@ public class NeutronL3Adapter {
                                           String defaultGatewayMacAddress,
                                           String gatewayIp,
                                           Action actionForNodeDefaultRoute) {
+        // TODO: As of Helium, mac address for default gateway is required (bug 1705).
+        if (defaultGatewayMacAddress == null) {
+            logger.error("ProgramDefaultRoute mac not provided. gatewayIp:{} node:{} action:{}",
+                         defaultGatewayMacAddress, gatewayIp, node, actionForNodeDefaultRoute);
+            return new Status(StatusCode.NOTIMPLEMENTED);  // Bug 1705
+        }
+
         Status status;
         try {
             InetAddress inetAddress = InetAddress.getByName(gatewayIp);