fix med topos

cnp3 · Aug 22, 2019 · 951510d · 951510d
1 parent a392351
commit 951510d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/launch_net.py b/launch_net.py
@@ -4,9 +4,9 @@
 from ipmininet.cli import IPCLI
 
 importlib.import_module('simple_bgp_network')
-from simple_topo_missing3 import SimpleBGPTopoMissing
+from topo_med import MedBGPTopo
 
-net = IPNet(topo=SimpleBGPTopoMissing())
+net = IPNet(topo=MedBGPTopo())
 ipmininet.DEBUG_FLAG = True
 try:
 	net.start()

diff --git a/simple_topo_med.py b/simple_topo_med.py
@@ -38,7 +38,7 @@ def build(self, *args, **kwargs):
 		as4r1 = self.addRouter('as4r1')
 		as4r1.addDaemon(BGP, address_families=(_bgp.AF_INET6(networks=('dead:beef::/48',)),))
 		as4r2 = self.addRouter('as4r2')
-		as4r2.addDaemon(BGP, address_families=(_bgp.AF_INET(networks=('dead:beef::/48',)),))
+		as4r2.addDaemon(BGP, address_families=(_bgp.AF_INET6(networks=('dead:beef::/48',)),))
 
 		# Add Links
 		self.addLink(as1r1, as1r6)
@@ -49,9 +49,9 @@ def build(self, *args, **kwargs):
 		self.addLink(as1r4, as1r5)
 		self.addLink(as1r5, as1r6)
 		self.addLink(as4r1, as1r6)
-		_bgp.set_med(self, as1r6, as4r1, 99)
+		_bgp.set_med(self, as4r1, as1r6, 99)
 		self.addLink(as4r2, as1r5)
-		_bgp.set_med(self, as1r5, as4r2, 50)
+		_bgp.set_med(self, as4r2, as1r5, 50)
 
 		# Add full mesh
 		self.addAS(4, (as4r1, as4r2))

diff --git a/topo_med.py b/topo_med.py
@@ -56,18 +56,18 @@ def build(self, *args, **kwargs):
 		self.addLink(as1r5, as1r6)
 		self.addLink(as4r1, as1r5)
 		self.addLink(as4r2, as1r4)
-		self.addLink(as3r1, as1r1)
+		self.addLink(as3r2, as1r1)
 		self.addLink(as3r1, as1r6)
 		self.addLink(as3r1, as3r2, igp_cost=7)
 		self.addLink(as3r1, as2r1)
 		self.addLink(as2r1, as4r1)
 		self.addLink(as4r1, as4r2, igp_cost=2)
 
 		# Set Med
-		_bgp.set_med(self, as1r1, as3r2, 7)
-		_bgp.set_med(self, as1r6, as3r1, 0)
-		_bgp.set_med(self, as1r5, as4r1, 0)
-		_bgp.set_med(self, as1r4, as4r2, 2)
+		_bgp.set_med(self, as3r2, as1r1, 7)
+		_bgp.set_med(self, as3r1, as1r6, 0)
+		_bgp.set_med(self, as4r1, as1r5, 0)
+		_bgp.set_med(self, as4r2, as1r4, 2)
 
 		# Add full mesh
 		self.addAS(2, (as2r1,))