Improve trellis hag for mcast use cases
Adding 1 IPv4, 1 IPv6 host and IPv6 address to dh1
Change-Id: I7fe30d8f85e76dde0948689fa04a9154530a5419
diff --git a/trellis/dhcpd.conf b/trellis/dhcpd.conf
index c57426c..35cb093 100644
--- a/trellis/dhcpd.conf
+++ b/trellis/dhcpd.conf
@@ -65,6 +65,11 @@
fixed-address 10.0.3.2;
}
+host h5 {
+ hardware ethernet 00:aa:00:00:00:05;
+ fixed-address 10.0.4.1;
+}
+
host dh1 {
hardware ethernet 00:cc:00:00:00:01;
fixed-address 10.1.2.1;
diff --git a/trellis/dhcpd6.conf b/trellis/dhcpd6.conf
index dc90e4f..dccb5ec 100644
--- a/trellis/dhcpd6.conf
+++ b/trellis/dhcpd6.conf
@@ -13,6 +13,16 @@
option dhcp6.next-hop 2000::03ff;
}
+subnet6 2000::400/120 {
+ range6 2000::460 2000::4fe;
+ option dhcp6.next-hop 2000::04ff;
+}
+
+subnet6 2001::200/120 {
+ range6 2001::260 2001::2fe;
+ option dhcp6.next-hop 2001::02ff;
+}
+
subnet6 2000::9903/128 {
}
@@ -47,6 +57,16 @@
fixed-address6 2000::302;
}
+host h5v6 {
+ hardware ethernet 00:bb:00:00:00:05;
+ fixed-address6 2000::401;
+}
+
+host dh1 {
+ hardware ethernet 00:cc:00:00:00:01;
+ fixed-address6 2001::202;
+}
+
host rpd5v6 {
hardware ethernet 00:ee:00:00:00:01;
fixed-address6 2000::a0a;
diff --git a/trellis/trellis_hag.json b/trellis/trellis_hag.json
index da19f9a..c8b2fc0 100644
--- a/trellis/trellis_hag.json
+++ b/trellis/trellis_hag.json
@@ -11,6 +11,22 @@
"of:0000000000000203/6" : {
"interfaces" : [
{
+ "ips" : [ "10.0.4.254/24" ],
+ "vlan-untagged": 22
+ }
+ ]
+ },
+ "of:0000000000000203/7" : {
+ "interfaces" : [
+ {
+ "ips" : [ "2000::4ff/120" ],
+ "vlan-untagged": 23
+ }
+ ]
+ },
+ "of:0000000000000203/8" : {
+ "interfaces" : [
+ {
"ips" : [ "10.1.2.254/24", "2001::2ff/120" ],
"vlan-untagged": 21
}
diff --git a/trellis/trellis_hag.py b/trellis/trellis_hag.py
index d78bd9d..b661d6c 100755
--- a/trellis/trellis_hag.py
+++ b/trellis/trellis_hag.py
@@ -11,8 +11,9 @@
from ipaddress import ip_network
from routinglib import BgpRouter
from routinglib import RoutedHost, RoutedHost6
-from trellislib import DhcpClient, Dhcp6Client, DhcpRelay, DhcpServer, Dhcp6Server
+from trellislib import DhcpClient, Dhcp6Client, Dhcp4and6Client, DhcpRelay, DhcpServer, Dhcp6Server
from trellislib import DualHomedDhcpClient
+from trellislib import DualHomedDhcp4and6Client
from trellislib import get_mininet, parse_trellis_args, set_up_zebra_config
from functools import partial
@@ -62,23 +63,27 @@
h2 = self.addHost('h2', cls=DhcpClient, mac='00:aa:00:00:00:02')
h3 = self.addHost('h3', cls=DhcpClient, mac='00:aa:00:00:00:03')
h4 = self.addHost('h4', cls=DhcpClient, mac='00:aa:00:00:00:04')
+ h5 = self.addHost('h5', cls=DhcpClient, mac='00:aa:00:00:00:05')
self.addLink(h1, s204)
self.addLink(h2, s204)
self.addLink(h3, s205)
self.addLink(h4, s205)
+ self.addLink(h5, s203)
# IPv6 Hosts
h1v6 = self.addHost('h1v6', cls=Dhcp6Client, mac='00:bb:00:00:00:01')
h2v6 = self.addHost('h2v6', cls=Dhcp6Client, mac='00:bb:00:00:00:02')
h3v6 = self.addHost('h3v6', cls=Dhcp6Client, mac='00:bb:00:00:00:03')
h4v6 = self.addHost('h4v6', cls=Dhcp6Client, mac='00:bb:00:00:00:04')
+ h5v6 = self.addHost('h5v6', cls=Dhcp6Client, mac='00:bb:00:00:00:05')
self.addLink(h1v6, s204)
self.addLink(h2v6, s204)
self.addLink(h3v6, s205)
self.addLink(h4v6, s205)
+ self.addLink(h5v6, s203)
- # Dual-homed IPv4 Host 203-204
- dh1 = self.addHost('dh1', cls=DualHomedDhcpClient, mac='00:cc:00:00:00:01')
+ # Dual-homed IPv4 and IPv6 Host on 203-204
+ dh1 = self.addHost('dh1', cls=DualHomedDhcp4and6Client, mac='00:cc:00:00:00:01')
self.addLink(dh1, s204)
self.addLink(dh1, s203)
diff --git a/trellis/trellislib.py b/trellis/trellislib.py
index 23bc5c3..9fd8d81 100644
--- a/trellis/trellislib.py
+++ b/trellis/trellislib.py
@@ -68,6 +68,30 @@
self.cmd('rm -rf %s' % self.pidFile)
super(Dhcp6Client, self).terminate()
+# Client that has on the same interface (eth0) both IPv4 and IPv6 addresses
+class Dhcp4and6Client(Host):
+ def __init__(self, name, *args, **kwargs):
+ super(Dhcp4and6Client, self).__init__(name, **kwargs)
+ self.pidFile4 = '/run/dhclient-%s-4.pid' % self.name
+ self.pidFile6 = '/run/dhclient-%s-6.pid' % self.name
+ self.leaseFile4 = '/var/lib/dhcp/dhcpclient-%s.lease' % (self.name, )
+ self.leaseFile6 = '/var/lib/dhcp/dhcpclient6-%s.lease' % (self.name, )
+
+ def config(self, **kwargs):
+ super(Dhcp4and6Client, self).config(**kwargs)
+ self.cmd('ip addr flush dev %s' % self.defaultIntf())
+ self.cmd('dhclient -q -4 -nw -pf %s -lf %s %s' % (self.pidFile4, self.leaseFile4, self.defaultIntf()))
+
+ self.cmd('ip -4 addr flush dev %s' % self.defaultIntf())
+ self.cmd('dhclient -q -6 -nw -pf %s -lf %s %s' % (self.pidFile6, self.leaseFile6, self.defaultIntf()))
+
+ def terminate(self, **kwargs):
+ self.cmd('kill -9 `cat %s`' % self.pidFile4)
+ self.cmd('rm -rf %s' % self.pidFile4)
+ self.cmd('kill -9 `cat %s`' % self.pidFile6)
+ self.cmd('rm -rf %s' % self.pidFile6)
+ super(Dhcp4and6Client, self).terminate()
+
class DhcpServer(RoutedHost):
binFile = '/usr/sbin/dhcpd'
pidFile = '/run/dhcp-server-dhcpd.pid'
@@ -189,6 +213,42 @@
self.cmd('rm -rf %s' % self.pidFile)
super(DualHomedDhcpClient, self).terminate()
+# Dual-homed Client that has both IPv4 and IPv6 addresses
+class DualHomedDhcp4and6Client(Host):
+ def __init__(self, name, *args, **kwargs):
+ super(DualHomedDhcp4and6Client, self).__init__(name, **kwargs)
+ self.pidFile4 = '/run/dhclient-%s-4.pid' % self.name
+ self.pidFile6 = '/run/dhclient-%s-6.pid' % self.name
+ self.bond0 = None
+
+ def config(self, **kwargs):
+ super(DualHomedDhcp4and6Client, self).config(**kwargs)
+ intf0 = self.intfs[0].name
+ intf1 = self.intfs[1].name
+ self.bond0 = "%s-bond0" % self.name
+ self.cmd('modprobe bonding')
+ self.cmd('ip link add %s type bond' % self.bond0)
+ self.cmd('ip link set %s down' % intf0)
+ self.cmd('ip link set %s down' % intf1)
+ self.cmd('ip link set %s master %s' % (intf0, self.bond0))
+ self.cmd('ip link set %s master %s' % (intf1, self.bond0))
+ self.cmd('ip -4 addr flush dev %s' % intf0)
+ self.cmd('ip -4 addr flush dev %s' % intf1)
+ self.cmd('ip addr flush dev %s' % intf0)
+ self.cmd('ip addr flush dev %s' % intf1)
+ self.cmd('ip link set %s up' % self.bond0)
+ self.cmd('dhclient -q -4 -nw -pf %s %s' % (self.pidFile4, self.bond0))
+ self.cmd('dhclient -q -6 -nw -pf %s %s' % (self.pidFile6, self.bond0))
+
+ def terminate(self, **kwargs):
+ self.cmd('ip link set %s down' % self.bond0)
+ self.cmd('ip link delete %s' % self.bond0)
+ self.cmd('kill -9 `cat %s`' % self.pidFile4)
+ self.cmd('kill -9 `cat %s`' % self.pidFile6)
+ self.cmd('rm -rf %s' % self.pidFile4)
+ self.cmd('rm -rf %s' % self.pidFile6)
+ super(DualHomedDhcp4and6Client, self).terminate()
+
# Utility for IPv6
def mac_to_ipv6_linklocal(mac):
'''