From 35698385428970e3a63198761aa76e6bd8fcc7d1 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Mon, 19 Nov 2012 12:30:53 -0800
Subject: [PATCH] Updated for new Topo API

---
 custom/topo-2sw-2host.py | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/custom/topo-2sw-2host.py b/custom/topo-2sw-2host.py
index c3342ee..620462d 100644
--- a/custom/topo-2sw-2host.py
+++ b/custom/topo-2sw-2host.py
@@ -11,36 +11,26 @@ topology enables one to pass in '--topo=mytopo' from the command line.
 """
 
 from mininet.topo import Topo
-from mininet.node import Node
 
 class MyTopo( Topo ):
     "Simple topology example."
 
-    def __init__( self, enable_all = True ):
+    def __init__( self ):
         "Create custom topo."
 
-        # Add default members to class.
-        super( MyTopo, self ).__init__()
+        # Initialize topology
+        Topo.__init__( self )
 
-        # Set Node IDs for hosts and switches
-        leftHost = 1
-        leftSwitch = 2
-        rightSwitch = 3
-        rightHost = 4
+        # Add hosts and switches
+        leftHost = self.addHost( 'h1' )
+        rightHost = self.addHost( 'h2' )
+        leftSwitch = self.addSwitch( 's3' )
+        rightSwitch = self.addSwitch( 's4' )
 
-        # Add nodes
-        self.addNode( leftSwitch, Node( isSwitch=True ) )
-        self.addNode( rightSwitch, Node( isSwitch=True ) )
-        self.addNode( leftHost, Node( isSwitch=False ) )
-        self.addNode( rightHost, Node( isSwitch=False ) )
-
-        # Add edges
-        self.add_edge( leftHost, leftSwitch )
-        self.add_edge( leftSwitch, rightSwitch )
-        self.add_edge( rightSwitch, rightHost )
-
-        # Consider all switches and hosts 'on'
-        self.enable_all()
+        # Add links
+        self.addLink( leftHost, leftSwitch )
+        self.addLink( leftSwitch, rightSwitch )
+        self.addLink( rightSwitch, rightHost )
 
 
 topos = { 'mytopo': ( lambda: MyTopo() ) }