Resolve IP address conflict
Reduce the size of internal management subnet such that it is less likely going to collide with others
Change-Id: Ia5538803e4e76aaf28d857ef429fb4d21f300e9d
diff --git a/trellis/trellis_dualhome.py b/trellis/trellis_dualhome.py
index 56c4599..04c0a21 100755
--- a/trellis/trellis_dualhome.py
+++ b/trellis/trellis_dualhome.py
@@ -99,14 +99,14 @@
# Control plane NAT (for quagga fpm)
nat = self.addHost('nat', cls=NAT,
- ip='172.16.0.1/12',
- subnet=str(ip_network(u'172.16.0.0/12')), inNamespace=False)
+ ip='172.16.0.1/24',
+ subnet=str(ip_network(u'172.16.0.0/24')), inNamespace=False)
self.addLink(cs0, nat)
# Internal Quagga bgp1
intfs = {'bgp1-eth0': [{'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:03', 'vlan': '110'},
{'ipAddrs': ['10.0.7.2/24', '2000::702/120'], 'mac': '00:88:00:00:00:03', 'vlan': '170'}],
- 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/12']}}
+ 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/24']}}
bgp1 = self.addHost('bgp1', cls=BgpRouter,
interfaces=intfs,
quaggaConfFile='./bgpdbgp1.conf',
@@ -117,7 +117,7 @@
# Internal Quagga bgp2
intfs = {'bgp2-eth0': [{'ipAddrs': ['10.0.5.2/24', '2000::502/120'], 'mac': '00:88:00:00:00:04', 'vlan': '150'},
{'ipAddrs': ['10.0.6.2/24', '2000::602/120'], 'mac': '00:88:00:00:00:04', 'vlan': '160'}],
- 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/12']}}
+ 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/24']}}
bgp2 = self.addHost('bgp2', cls=BgpRouter,
interfaces=intfs,
quaggaConfFile='./bgpdbgp2.conf',
diff --git a/trellis/trellis_duallink.py b/trellis/trellis_duallink.py
index da6b399..77b0169 100755
--- a/trellis/trellis_duallink.py
+++ b/trellis/trellis_duallink.py
@@ -81,13 +81,13 @@
# Control plane NAT (for quagga fpm)
nat = self.addHost('nat', cls=NAT,
- ip='172.16.0.1/12',
- subnet=str(ip_network(u'172.16.0.0/12')), inNamespace=False)
+ ip='172.16.0.1/24',
+ subnet=str(ip_network(u'172.16.0.0/24')), inNamespace=False)
self.addLink(cs0, nat)
# Internal Quagga bgp1
intfs = {'bgp1-eth0': {'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:02'},
- 'bgp1-eth1': {'ipAddrs': ['172.16.0.2/12']}}
+ 'bgp1-eth1': {'ipAddrs': ['172.16.0.2/24']}}
bgp1 = self.addHost('bgp1', cls=BgpRouter,
interfaces=intfs,
quaggaConfFile='./bgpdbgp1.conf',
diff --git a/trellis/trellis_hag.py b/trellis/trellis_hag.py
index b661d6c..9e2cda9 100755
--- a/trellis/trellis_hag.py
+++ b/trellis/trellis_hag.py
@@ -104,18 +104,18 @@
# Control plane NAT (for quagga fpm)
nat = self.addHost('nat', cls=NAT,
- ip='172.16.0.1/12',
- subnet=str(ip_network(u'172.16.0.0/12')), inNamespace=False)
+ ip='172.16.0.1/24',
+ subnet=str(ip_network(u'172.16.0.0/24')), inNamespace=False)
self.addLink(cs0, nat)
# Internal Quagga bgp1
"""
intfs = {'bgp1-eth0': [{'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:03', 'vlan': '110'},
{'ipAddrs': ['10.0.7.2/24', '2000::702/120'], 'mac': '00:88:00:00:00:03', 'vlan': '170'}],
- 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/12']}}
+ 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/24']}}
"""
intfs = {'bgp1-eth0': {'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:03', 'vlan': '110'},
- 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/12']}}
+ 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/24']}}
bgp1 = self.addHost('bgp1', cls=BgpRouter,
interfaces=intfs,
quaggaConfFile='./bgpdbgp1.conf',
@@ -127,10 +127,10 @@
"""
intfs = {'bgp2-eth0': [{'ipAddrs': ['10.0.5.2/24', '2000::502/120'], 'mac': '00:88:00:00:00:04', 'vlan': '150'},
{'ipAddrs': ['10.0.6.2/24', '2000::602/120'], 'mac': '00:88:00:00:00:04', 'vlan': '160'}],
- 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/12']}}
+ 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/24']}}
"""
intfs = {'bgp2-eth0': {'ipAddrs': ['10.0.6.2/24', '2000::602/120'], 'mac': '00:88:00:00:00:04', 'vlan': '160'},
- 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/12']}}
+ 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/24']}}
bgp2 = self.addHost('bgp2', cls=BgpRouter,
interfaces=intfs,
quaggaConfFile='./bgpdbgp2.conf',
diff --git a/trellis/trellis_hybrid.py b/trellis/trellis_hybrid.py
index 2f8f34e..3bdea71 100755
--- a/trellis/trellis_hybrid.py
+++ b/trellis/trellis_hybrid.py
@@ -106,18 +106,18 @@
# Control plane NAT (for quagga fpm)
nat = self.addHost('nat', cls=NAT,
- ip='172.16.0.1/12',
- subnet=str(ip_network(u'172.16.0.0/12')), inNamespace=False)
+ ip='172.16.0.1/24',
+ subnet=str(ip_network(u'172.16.0.0/24')), inNamespace=False)
self.addLink(cs0, nat)
# Internal Quagga bgp1
"""
intfs = {'bgp1-eth0': [{'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:03', 'vlan': '110'},
{'ipAddrs': ['10.0.7.2/24', '2000::702/120'], 'mac': '00:88:00:00:00:03', 'vlan': '170'}],
- 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/12']}}
+ 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/24']}}
"""
intfs = {'bgp1-eth0': {'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:03', 'vlan': '110'},
- 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/12']}}
+ 'bgp1-eth1': {'ipAddrs': ['172.16.0.3/24']}}
bgp1 = self.addHost('bgp1', cls=BgpRouter,
interfaces=intfs,
quaggaConfFile='./bgpdbgp1.conf',
@@ -129,10 +129,10 @@
"""
intfs = {'bgp2-eth0': [{'ipAddrs': ['10.0.5.2/24', '2000::502/120'], 'mac': '00:88:00:00:00:04', 'vlan': '150'},
{'ipAddrs': ['10.0.6.2/24', '2000::602/120'], 'mac': '00:88:00:00:00:04', 'vlan': '160'}],
- 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/12']}}
+ 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/24']}}
"""
intfs = {'bgp2-eth0': {'ipAddrs': ['10.0.6.2/24', '2000::602/120'], 'mac': '00:88:00:00:00:04', 'vlan': '160'},
- 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/12']}}
+ 'bgp2-eth1': {'ipAddrs': ['172.16.0.4/24']}}
bgp2 = self.addHost('bgp2', cls=BgpRouter,
interfaces=intfs,
quaggaConfFile='./bgpdbgp2.conf',
diff --git a/trellis/trellis_remote_dhcp.py b/trellis/trellis_remote_dhcp.py
index fbc1c7f..887e17d 100755
--- a/trellis/trellis_remote_dhcp.py
+++ b/trellis/trellis_remote_dhcp.py
@@ -74,13 +74,13 @@
# Control plane NAT (for quagga fpm)
nat = self.addHost('nat', cls=NAT,
- ip='172.16.0.1/12',
- subnet=str(ip_network(u'172.16.0.0/12')), inNamespace=False)
+ ip='172.16.0.1/24',
+ subnet=str(ip_network(u'172.16.0.0/24')), inNamespace=False)
self.addLink(cs0, nat)
# Internal Quagga bgp1
intfs = {'bgp1-eth0': {'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:02'},
- 'bgp1-eth1': {'ipAddrs': ['172.16.0.2/12']}}
+ 'bgp1-eth1': {'ipAddrs': ['172.16.0.2/24']}}
bgp1 = self.addHost('bgp1', cls=BgpRouter,
interfaces=intfs,
quaggaConfFile='./bgpdbgp1.conf',
diff --git a/trellis/trellis_vlan.py b/trellis/trellis_vlan.py
index 89b3a3d..433eb25 100755
--- a/trellis/trellis_vlan.py
+++ b/trellis/trellis_vlan.py
@@ -70,13 +70,13 @@
# Control plane NAT (for quagga fpm)
nat = self.addHost('nat', cls=NAT,
- ip='172.16.0.1/12',
- subnet=str(ip_network(u'172.16.0.0/12')), inNamespace=False)
+ ip='172.16.0.1/24',
+ subnet=str(ip_network(u'172.16.0.0/24')), inNamespace=False)
self.addLink(cs0, nat)
# Internal Quagga bgp1
intfs = {'bgp1-eth0': {'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:02', 'vlan': '10'},
- 'bgp1-eth1': {'ipAddrs': ['172.16.0.2/12']}}
+ 'bgp1-eth1': {'ipAddrs': ['172.16.0.2/24']}}
bgp1 = self.addHost('bgp1', cls=BgpRouter,
interfaces=intfs,
quaggaConfFile='./bgpdbgp1.conf',