Merge lp:~mpontillo/maas/fix-relay-vlan-hostmap-creation--bug-1686755 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Fix hostmap creation when IP addresses are created on VLANs with DHCP relay enabled. Also fix DHCP snippet triggers to fire when they occur on a VLAN with DHCP relay enabled.

[Blake Rouse (blake-rouse)]

Looks good mostly. But have some issues in the dhcp alert procedure that needs to be fixed.

review: Needs Fixing

[Mike Pontillo (mpontillo)]

Fixed. Thanks.

[Blake Rouse (blake-rouse)]

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Thanks for the fixes. Looks good.

review: Approve

=== modified file 'src/maasserver/triggers/system.py'
--- src/maasserver/triggers/system.py	2017-01-28 00:51:47 +0000
+++ src/maasserver/triggers/system.py	2017-05-05 15:31:09 +0000
@@ -368,10 +368,27 @@
 DHCP_ALERT = dedent("""\
     CREATE OR REPLACE FUNCTION sys_dhcp_alert(vlan maasserver_vlan)
     RETURNS void AS $$
+    DECLARE
+      relay_vlan maasserver_vlan;
     BEGIN
-      PERFORM pg_notify(CONCAT('sys_dhcp_', vlan.primary_rack_id), '');
-      IF vlan.secondary_rack_id IS NOT NULL THEN
-        PERFORM pg_notify(CONCAT('sys_dhcp_', vlan.secondary_rack_id), '');
+      IF vlan.dhcp_on THEN
+        PERFORM pg_notify(CONCAT('sys_dhcp_', vlan.primary_rack_id), '');
+        IF vlan.secondary_rack_id IS NOT NULL THEN
+          PERFORM pg_notify(CONCAT('sys_dhcp_', vlan.secondary_rack_id), '');
+        END IF;
+      END IF;
+      IF vlan.relay_vlan_id IS NOT NULL THEN
+        SELECT maasserver_vlan.* INTO relay_vlan
+        FROM maasserver_vlan
+        WHERE maasserver_vlan.id = vlan.relay_vlan_id;
+        IF relay_vlan.dhcp_on THEN
+          PERFORM pg_notify(CONCAT(
+            'sys_dhcp_', relay_vlan.primary_rack_id), '');
+          IF relay_vlan.secondary_rack_id IS NOT NULL THEN
+            PERFORM pg_notify(CONCAT(
+              'sys_dhcp_', relay_vlan.secondary_rack_id), '');
+          END IF;
+        END IF;
       END IF;
       RETURN;
     END;
@@ -393,15 +410,11 @@
         -- Update old VLAN if DHCP is enabled.
         SELECT * INTO vlan
         FROM maasserver_vlan WHERE id = OLD.vlan_id;
-        IF vlan.dhcp_on THEN
-          PERFORM sys_dhcp_alert(vlan);
-        END IF;
+        PERFORM sys_dhcp_alert(vlan);
         -- Update the new VLAN if DHCP is enabled.
         SELECT * INTO vlan
         FROM maasserver_vlan WHERE id = NEW.vlan_id;
-        IF vlan.dhcp_on THEN
-          PERFORM sys_dhcp_alert(vlan);
-        END IF;
+        PERFORM sys_dhcp_alert(vlan);
       -- Related fields of subnet where changed.
       ELSIF OLD.cidr != NEW.cidr OR
         (OLD.gateway_ip IS NULL AND NEW.gateway_ip IS NOT NULL) OR
@@ -411,9 +424,7 @@
         -- Network has changed update alert DHCP if enabled.
         SELECT * INTO vlan
         FROM maasserver_vlan WHERE id = NEW.vlan_id;
-        IF vlan.dhcp_on THEN
-          PERFORM sys_dhcp_alert(vlan);
-        END IF;
+        PERFORM sys_dhcp_alert(vlan);
       END IF;
       RETURN NEW;
     END;
@@ -431,9 +442,7 @@
       -- Update VLAN if DHCP is enabled.
       SELECT * INTO vlan
       FROM maasserver_vlan WHERE id = OLD.vlan_id;
-      IF vlan.dhcp_on THEN
-        PERFORM sys_dhcp_alert(vlan);
-      END IF;
+      PERFORM sys_dhcp_alert(vlan);
       RETURN NEW;
     END;
     $$ LANGUAGE plpgsql;
@@ -453,9 +462,7 @@
         FROM maasserver_vlan, maasserver_subnet
         WHERE maasserver_subnet.id = NEW.subnet_id AND
           maasserver_subnet.vlan_id = maasserver_vlan.id;
-        IF vlan.dhcp_on THEN
-          PERFORM sys_dhcp_alert(vlan);
-        END IF;
+        PERFORM sys_dhcp_alert(vlan);
       END IF;
       RETURN NEW;
     END;
@@ -476,9 +483,7 @@
         FROM maasserver_vlan, maasserver_subnet
         WHERE maasserver_subnet.id = NEW.subnet_id AND
           maasserver_subnet.vlan_id = maasserver_vlan.id;
-        IF vlan.dhcp_on THEN
-          PERFORM sys_dhcp_alert(vlan);
-        END IF;
+        PERFORM sys_dhcp_alert(vlan);
       END IF;
       RETURN NEW;
     END;
@@ -499,9 +504,7 @@
         FROM maasserver_vlan, maasserver_subnet
         WHERE maasserver_subnet.id = OLD.subnet_id AND
           maasserver_subnet.vlan_id = maasserver_vlan.id;
-        IF vlan.dhcp_on THEN
-          PERFORM sys_dhcp_alert(vlan);
-        END IF;
+        PERFORM sys_dhcp_alert(vlan);
       END IF;
       RETURN NEW;
     END;
@@ -523,9 +526,7 @@
         FROM maasserver_vlan, maasserver_subnet
         WHERE maasserver_subnet.id = NEW.subnet_id AND
           maasserver_subnet.vlan_id = maasserver_vlan.id;
-        IF vlan.dhcp_on THEN
-          PERFORM sys_dhcp_alert(vlan);
-        END IF;
+        PERFORM sys_dhcp_alert(vlan);
       END IF;
       RETURN NEW;
     END;
@@ -556,17 +557,11 @@
             maasserver_subnet.vlan_id = maasserver_vlan.id;
           IF old_vlan.id != new_vlan.id THEN
             -- Different VLAN's; update each if DHCP enabled.
-            IF old_vlan.dhcp_on THEN
-              PERFORM sys_dhcp_alert(old_vlan);
-            END IF;
-            IF new_vlan.dhcp_on THEN
-              PERFORM sys_dhcp_alert(new_vlan);
-            END IF;
+            PERFORM sys_dhcp_alert(old_vlan);
+            PERFORM sys_dhcp_alert(new_vlan);
           ELSE
             -- Same VLAN so only need to update once.
-            IF new_vlan.dhcp_on THEN
-              PERFORM sys_dhcp_alert(new_vlan);
-            END IF;
+            PERFORM sys_dhcp_alert(new_vlan);
           END IF;
         ELSIF (OLD.ip IS NULL AND NEW.ip IS NOT NULL) OR
           (OLD.ip IS NOT NULL and NEW.ip IS NULL) OR
@@ -576,9 +571,7 @@
           FROM maasserver_vlan, maasserver_subnet
           WHERE maasserver_subnet.id = NEW.subnet_id AND
             maasserver_subnet.vlan_id = maasserver_vlan.id;
-          IF new_vlan.dhcp_on THEN
-            PERFORM sys_dhcp_alert(new_vlan);
-          END IF;
+          PERFORM sys_dhcp_alert(new_vlan);
         END IF;
       END IF;
       RETURN NEW;
@@ -600,9 +593,7 @@
         FROM maasserver_vlan, maasserver_subnet
         WHERE maasserver_subnet.id = OLD.subnet_id AND
           maasserver_subnet.vlan_id = maasserver_vlan.id;
-        IF vlan.dhcp_on THEN
-          PERFORM sys_dhcp_alert(vlan);
-        END IF;
+        PERFORM sys_dhcp_alert(vlan);
       END IF;
       RETURN NEW;
     END;
@@ -635,8 +626,7 @@
           AND maasserver_staticipaddress.alloc_type != 6
           AND maasserver_staticipaddress.ip IS NOT NULL
           AND host(maasserver_staticipaddress.ip) != ''
-          AND maasserver_vlan.id = maasserver_subnet.vlan_id
-          AND maasserver_vlan.dhcp_on)
+          AND maasserver_vlan.id = maasserver_subnet.vlan_id)
         LOOP
           PERFORM sys_dhcp_alert(vlan);
         END LOOP;
@@ -673,8 +663,7 @@
           AND maasserver_staticipaddress.alloc_type != 6
           AND maasserver_staticipaddress.ip IS NOT NULL
           AND host(maasserver_staticipaddress.ip) != ''
-          AND maasserver_vlan.id = maasserver_subnet.vlan_id
-          AND maasserver_vlan.dhcp_on)
+          AND maasserver_vlan.id = maasserver_subnet.vlan_id)
         LOOP
           PERFORM sys_dhcp_alert(vlan);
         END LOOP;
@@ -723,7 +712,8 @@
           maasserver_subnet
         WHERE maasserver_subnet.id = _subnet_id
           AND maasserver_vlan.id = maasserver_subnet.vlan_id
-          AND maasserver_vlan.dhcp_on = true)
+          AND (maasserver_vlan.dhcp_on = true
+            OR maasserver_vlan.relay_vlan_id IS NOT NULL))
         LOOP
           PERFORM sys_dhcp_alert(vlan);
         END LOOP;
@@ -744,8 +734,8 @@
           FROM maasserver_vlan, maasserver_interface
           WHERE maasserver_interface.node_id = _node_id
             AND maasserver_interface.vlan_id = maasserver_vlan.id
-            AND maasserver_vlan.dhcp_on = true
-        )
+          AND (maasserver_vlan.dhcp_on = true
+            OR maasserver_vlan.relay_vlan_id IS NOT NULL))
         SELECT primary_rack_id FROM racks
         WHERE primary_rack_id IS NOT NULL
         UNION

=== modified file 'src/maasserver/triggers/testing.py'
--- src/maasserver/triggers/testing.py	2017-04-11 01:29:40 +0000
+++ src/maasserver/triggers/testing.py	2017-05-05 15:31:09 +0000
@@ -372,9 +372,11 @@
         event.delete()
 
     @transactional
-    def create_staticipaddress(self, params=None):
+    def create_staticipaddress(self, params=None, vlan=None):
         if params is None:
             params = {}
+        if vlan is not None:
+            params['subnet'] = vlan.subnet_set.first()
         return factory.make_StaticIPAddress(**params)
 
     @transactional

=== modified file 'src/maasserver/triggers/tests/test_system_listener.py'
--- src/maasserver/triggers/tests/test_system_listener.py	2017-01-28 00:51:47 +0000
+++ src/maasserver/triggers/tests/test_system_listener.py	2017-05-05 15:31:09 +0000
@@ -842,6 +842,115 @@
 
     @wait_for_reactor
     @inlineCallbacks
+    def test_sends_messages_when_ip_address_created(self):
+        primary_rack = yield deferToDatabase(self.create_rack_controller)
+        secondary_rack = yield deferToDatabase(self.create_rack_controller)
+        vlan = yield deferToDatabase(self.create_vlan, params={
+            "dhcp_on": True,
+            "primary_rack": primary_rack,
+            "secondary_rack": secondary_rack,
+        })
+        relay_vlan = yield deferToDatabase(self.create_vlan, params={
+            "relay_vlan": vlan
+        })
+        yield deferToDatabase(self.create_subnet, {
+            "vlan": relay_vlan,
+        })
+        yield deferToDatabase(register_system_triggers)
+        primary_rack_dv = DeferredValue()
+        secondary_rack_dv = DeferredValue()
+        listener = self.make_listener_without_delay()
+        listener.register(
+            "sys_dhcp_%s" % primary_rack.id,
+            lambda *args: primary_rack_dv.set(args))
+        listener.register(
+            "sys_dhcp_%s" % secondary_rack.id,
+            lambda *args: secondary_rack_dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.create_staticipaddress, vlan=relay_vlan)
+            yield primary_rack_dv.get(timeout=2)
+            yield secondary_rack_dv.get(timeout=2)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_sends_messages_when_ip_address_updated(self):
+        primary_rack = yield deferToDatabase(self.create_rack_controller)
+        secondary_rack = yield deferToDatabase(self.create_rack_controller)
+        vlan = yield deferToDatabase(self.create_vlan, params={
+            "dhcp_on": True,
+            "primary_rack": primary_rack,
+            "secondary_rack": secondary_rack,
+        })
+        relay_vlan = yield deferToDatabase(self.create_vlan, params={
+            "relay_vlan": vlan
+        })
+        yield deferToDatabase(self.create_subnet, {
+            "vlan": relay_vlan,
+        })
+        yield deferToDatabase(register_system_triggers)
+        primary_rack_dv = DeferredValue()
+        secondary_rack_dv = DeferredValue()
+        listener = self.make_listener_without_delay()
+        listener.register(
+            "sys_dhcp_%s" % primary_rack.id,
+            lambda *args: primary_rack_dv.set(args))
+        listener.register(
+            "sys_dhcp_%s" % secondary_rack.id,
+            lambda *args: secondary_rack_dv.set(args))
+        sip = yield deferToDatabase(
+            self.create_staticipaddress, vlan=relay_vlan)
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_staticipaddress, sip.id, params={
+                    'ip': ''
+                })
+            yield primary_rack_dv.get(timeout=2)
+            yield secondary_rack_dv.get(timeout=2)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_sends_messages_when_ip_address_deleted(self):
+        primary_rack = yield deferToDatabase(self.create_rack_controller)
+        secondary_rack = yield deferToDatabase(self.create_rack_controller)
+        vlan = yield deferToDatabase(self.create_vlan, params={
+            "dhcp_on": True,
+            "primary_rack": primary_rack,
+            "secondary_rack": secondary_rack,
+        })
+        relay_vlan = yield deferToDatabase(self.create_vlan, params={
+            "relay_vlan": vlan
+        })
+        yield deferToDatabase(self.create_subnet, {
+            "vlan": relay_vlan,
+        })
+        yield deferToDatabase(register_system_triggers)
+        primary_rack_dv = DeferredValue()
+        secondary_rack_dv = DeferredValue()
+        listener = self.make_listener_without_delay()
+        listener.register(
+            "sys_dhcp_%s" % primary_rack.id,
+            lambda *args: primary_rack_dv.set(args))
+        listener.register(
+            "sys_dhcp_%s" % secondary_rack.id,
+            lambda *args: secondary_rack_dv.set(args))
+        sip = yield deferToDatabase(
+            self.create_staticipaddress, vlan=relay_vlan)
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.delete_staticipaddress, sip.id)
+            yield primary_rack_dv.get(timeout=2)
+            yield secondary_rack_dv.get(timeout=2)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
     def test_sends_messages_when_relay_vlan_unset(self):
         yield deferToDatabase(register_system_triggers)
         primary_rack = yield deferToDatabase(self.create_rack_controller)
@@ -1283,6 +1392,11 @@
         MAASTransactionServerTestCase, TransactionalHelpersMixin):
     """End-to-end test for the DHCP triggers code."""
 
+    scenarios = (
+        ('with_dhcp_relay', {"dhcp_relay": True}),
+        ('without_dhcp_relay', {"dhcp_relay": False}),
+    )
+
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_new_managed_dhcp_range(self):
@@ -1294,12 +1408,16 @@
             "primary_rack": primary_rack,
             "secondary_rack": secondary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         network = factory.make_ipv4_network()
         subnet = yield deferToDatabase(self.create_subnet, {
             "cidr": str(network.cidr),
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
-
         listener = self.make_listener_without_delay()
         primary_dv = DeferredValue()
         listener.register(
@@ -1336,10 +1454,15 @@
             "primary_rack": primary_rack,
             "secondary_rack": secondary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         network = factory.make_ipv4_network()
         subnet = yield deferToDatabase(self.create_subnet, {
             "cidr": str(network.cidr),
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         network = subnet.get_ipnetwork()
         start_ip = str(IPAddress(network.first + 2))
@@ -1382,10 +1505,15 @@
             "primary_rack": primary_rack,
             "secondary_rack": secondary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         network = factory.make_ipv4_network()
         subnet = yield deferToDatabase(self.create_subnet, {
             "cidr": str(network.cidr),
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         network = subnet.get_ipnetwork()
         start_ip = str(IPAddress(network.first + 2))
@@ -1427,10 +1555,15 @@
             "primary_rack": primary_rack,
             "secondary_rack": secondary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         network = factory.make_ipv4_network()
         subnet = yield deferToDatabase(self.create_subnet, {
             "cidr": str(network.cidr),
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         network = subnet.get_ipnetwork()
         start_ip = str(IPAddress(network.first + 2))
@@ -1472,10 +1605,15 @@
             "primary_rack": primary_rack,
             "secondary_rack": secondary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         network = factory.make_ipv4_network()
         subnet = yield deferToDatabase(self.create_subnet, {
             "cidr": str(network.cidr),
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         network = subnet.get_ipnetwork()
         start_ip = str(IPAddress(network.first + 2))
@@ -1536,7 +1674,7 @@
             lambda *args: secondary_dv.set(args))
         yield listener.startService()
         try:
-            yield deferToDatabase(self.create_staticipaddress, {
+            yield deferToDatabase(self.create_staticipaddress, params={
                 "subnet": subnet,
                 "alloc_type": IPADDRESS_TYPE.USER_RESERVED,
                 "user": user,
@@ -1987,6 +2125,11 @@
         MAASTransactionServerTestCase, TransactionalHelpersMixin):
     """End-to-end test for the DHCP triggers code."""
 
+    scenarios = (
+        ('with_dhcp_relay', {"dhcp_relay": True}),
+        ('without_dhcp_relay', {"dhcp_relay": False}),
+    )
+
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_global_dhcp_snippet_inserted(self):
@@ -1996,8 +2139,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
@@ -2022,8 +2170,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
@@ -2051,8 +2204,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         subnet = yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
@@ -2078,8 +2236,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         node = yield deferToDatabase(self.create_node)
         yield deferToDatabase(self.create_interface, {
@@ -2110,8 +2273,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dhcp_snippet = yield deferToDatabase(self.create_dhcp_snippet, {
             "enabled": True,
@@ -2140,8 +2308,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dhcp_snippet = yield deferToDatabase(self.create_dhcp_snippet, {
             "enabled": False,
@@ -2173,8 +2346,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dhcp_snippet = yield deferToDatabase(self.create_dhcp_snippet, {
             "enabled": False,
@@ -2202,8 +2380,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dhcp_snippet = yield deferToDatabase(self.create_dhcp_snippet, {
             "enabled": True,
@@ -2231,8 +2414,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         subnet = yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dhcp_snippet = yield deferToDatabase(self.create_dhcp_snippet, {
             "enabled": True,
@@ -2260,8 +2448,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         node = yield deferToDatabase(self.create_node)
         yield deferToDatabase(self.create_interface, {
@@ -2294,8 +2487,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dhcp_snippet = yield deferToDatabase(self.create_dhcp_snippet, {
             "enabled": True,
@@ -2321,8 +2519,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dhcp_snippet = yield deferToDatabase(self.create_dhcp_snippet, {
             "enabled": False,
@@ -2351,8 +2554,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         subnet = yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         dhcp_snippet = yield deferToDatabase(self.create_dhcp_snippet, {
             "enabled": True,
@@ -2379,8 +2587,13 @@
             "dhcp_on": True,
             "primary_rack": primary_rack,
         })
+        relay_vlan = None
+        if self.dhcp_relay:
+            relay_vlan = yield deferToDatabase(self.create_vlan, {
+                "relay_vlan": vlan,
+            })
         yield deferToDatabase(self.create_subnet, {
-            "vlan": vlan,
+            "vlan": relay_vlan if self.dhcp_relay else vlan,
         })
         node = yield deferToDatabase(self.create_node)
         yield deferToDatabase(self.create_interface, {