Consolidate install script and add cmd-line options

Now, the majority the install can be done with one line, but the other
to each part of the install is still available.

Also fix a few bugs and add Wireshark coloring rules.
This commit is contained in:
Brandon Heller
2010-03-24 05:19:52 -07:00
parent e91b2815fa
commit 0b1832ddc2
15 changed files with 302 additions and 197 deletions
+8 -10
View File
@@ -28,20 +28,18 @@ class MyTopo( Topo ):
rightHost = 4
# Add nodes
self._add_node( leftSwitch, Node( is_switch=True ) )
self._add_node( rightSwitch, Node( is_switch=True ) )
self._add_node( leftHost, Node( is_switch=False ) )
self._add_node( rightHost, Node( is_switch=False ) )
self.add_node( leftSwitch, Node( is_switch=True ) )
self.add_node( rightSwitch, Node( is_switch=True ) )
self.add_node( leftHost, Node( is_switch=False ) )
self.add_node( rightHost, Node( is_switch=False ) )
# Add edges
self._add_edge( leftHost, leftSwitch )
self._add_edge( leftSwitch, rightSwitch )
self._add_edge( rightSwitch, rightHost )
self.add_edge( leftHost, leftSwitch )
self.add_edge( leftSwitch, rightSwitch )
self.add_edge( rightSwitch, rightHost )
# Consider all switches and hosts 'on'
self.enable_all()
topos = { 'mytopo': MyTopo }
# topos = { 'mytopo': ( lambda: MyTopo() ) }
topos = { 'mytopo': ( lambda: MyTopo() ) }