fix bad functio removal

cnp3 · Sep 19, 2019 · 171d8bd · 171d8bd
1 parent f9d1daa
commit 171d8bd
Show file tree

Hide file tree

Showing 21 changed files with 104 additions and 4 deletions.
diff --git a/launch_net.py b/launch_net.py
@@ -2,6 +2,7 @@
 import ipmininet
 from ipmininet.ipnet import IPNet
 from ipmininet.cli import IPCLI
+from ipmininet.clean import cleanup
 from mininet.log import lg, LEVELS
 
 from simple_bgp_network import SimpleBGPTopo
@@ -77,3 +78,4 @@ def parse_args():
         IPCLI(net)
     finally:
         net.stop()
+        cleanup()
diff --git a/simple_topo.py b/simple_topo.py
@@ -44,3 +44,8 @@ def build(self, *args, **kwargs):
 
         super(SimpleBGPTopo, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/simple_topo_2rr.py b/simple_topo_2rr.py
@@ -46,3 +46,9 @@ def build(self, *args, **kwargs):
 
         super(SimpleBGPTopo2RR, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
+
diff --git a/simple_topo_as.py b/simple_topo_as.py
@@ -59,3 +59,8 @@ def build(self, *args, **kwargs):
 
         super(SimpleBGPTopoAS, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/simple_topo_err.py b/simple_topo_err.py
@@ -46,3 +46,8 @@ def build(self, *args, **kwargs):
 
         super(SimpleBGPTopoErr, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/simple_topo_missing1.py b/simple_topo_missing1.py
@@ -57,3 +57,8 @@ def build(self, *args, **kwargs):
 
         super(SimpleBGPTopoMissing1, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/simple_topo_missing2.py b/simple_topo_missing2.py
@@ -59,3 +59,8 @@ def build(self, *args, **kwargs):
 
         super(SimpleBGPTopoMissing2, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/simple_topo_missing3.py b/simple_topo_missing3.py
@@ -58,3 +58,8 @@ def build(self, *args, **kwargs):
 
         super(SimpleBGPTopoMissing3, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/simple_topo_routes.py b/simple_topo_routes.py
@@ -51,3 +51,9 @@ def build(self, *args, **kwargs):
 
         super(SimpleBGPTopoRoutes, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r       
+
diff --git a/simple_topo_rr.py b/simple_topo_rr.py
@@ -45,3 +45,8 @@ def build(self, *args, **kwargs):
 
         super(SimpleBGPTopoRR, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_2rr_1.py b/topo_2rr_1.py
@@ -77,3 +77,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopo2RR1, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_2rr_2.py b/topo_2rr_2.py
@@ -76,3 +76,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopo2RR2, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_2rr_3.py b/topo_2rr_3.py
@@ -76,3 +76,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopo2RR3, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_2rr_4.py b/topo_2rr_4.py
@@ -77,3 +77,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopo2RR4, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_2rr_5.py b/topo_2rr_5.py
@@ -77,3 +77,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopo2RR5, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_3rr_1.py b/topo_3rr_1.py
@@ -92,3 +92,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopo3RR1, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_3rr_2.py b/topo_3rr_2.py
@@ -68,3 +68,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopo3RR2, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_3rr_3.py b/topo_3rr_3.py
@@ -68,3 +68,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopo3RR3, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_med.py b/topo_med.py
@@ -3,7 +3,6 @@
 
 
 class MedBGPTopo(IPTopo):
-    """This topology is composed of two AS connected in dual homing with different local pref"""
 
     def build(self, *args, **kwargs):
         """
@@ -93,8 +92,10 @@ def build(self, *args, **kwargs):
         ebgp_session(self, as3r1, as2r1)
         ebgp_session(self, as2r1, as4r1)
 
-        # Add test hosts ?
-        # for r in self.routers():
-        #     self.addLink(r, self.addHost('h%s' % r))
         super(MedBGPTopo, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_te_1.py b/topo_te_1.py
@@ -65,3 +65,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopoTE1, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r
diff --git a/topo_te_2.py b/topo_te_2.py
@@ -65,3 +65,8 @@ def build(self, *args, **kwargs):
 
         super(BGPTopoTE2, self).build(*args, **kwargs)
 
+    def bgp(self, name):
+        r = self.addRouter(name)
+        r.addDaemon(BGP, address_families=(
+            AF_INET6(redistribute=('connected',)),))
+        return r