Update Mininet VagrantBox (part 2)

    Add xauth pkg to mininet
    Add file: resources/mininet/cheatsheet.txt
    Rename topology inside topo.py to L3TestTopo (instead of MyTopo)

Change-Id: Ia5b7ffe59a29cc1fef00bf77faac63bf27669343
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/resources/mininet/cheatsheet.txt b/resources/mininet/cheatsheet.txt
new file mode 100644 (file)
index 0000000..0161f72
--- /dev/null
+++ b/resources/mininet/cheatsheet.txt
@@ -0,0 +1,11 @@
+# capturing packets
+export HOST=`ifconfig | awk -F"-" '/^.+-eth0/ {print $1}'`
+echo "this is host ${HOST}"
+
+# to see it in the screen
+## tcpdump -XX -n -e -i ${HOST}-eth0
+
+# capture to a file
+tcpdump -w /vagrant/resources/mininet/${HOST}.pcap -s0 -vvv -e -n -c 100 -i ${HOST}-eth0
+
+

diff --git a/resources/mininet/topo.py b/resources/mininet/topo.py
index ca3289442b00180e2034ed926357cf05408757d1..5ebe23abf20d0b839cea4e9a5261a7b93364e8ac 100644 (file)
--- a/resources/mininet/topo.py
+++ b/resources/mininet/topo.py
@@ -17,9 +17,9 @@ topology enables one to pass in '--topo=mytopo' from the command line.
 
 from mininet.topo import Topo
 
-class MyTopo( Topo ):
+class L3TestTopo( Topo ):
 
-    """L3 topology."""
+    """L3 test topology."""
 
     def __init__( self ):
         """Create custom topo."""
@@ -56,5 +56,5 @@ class MyTopo( Topo ):
         self.addLink( s1, h3 )
         self.addLink( s1, h4 )
 
-topos = {'l3': ( lambda: MyTopo() )}
+topos = {'l3': ( lambda: L3TestTopo() )}
 

diff --git a/resources/puppet/manifests/mininet.pp b/resources/puppet/manifests/mininet.pp
index b0e7922ee1f26de07edf6f6b56654c0c050e693f..91ac25ad44d80828ec908bdeadcd80322bb4c172 100644 (file)
--- a/resources/puppet/manifests/mininet.pp
+++ b/resources/puppet/manifests/mininet.pp
@@ -8,7 +8,8 @@ $deps = [ 'build-essential',
           'python-qt4',
           'python-zopeinterface',
           'python-twisted-conch',
-          'python-twisted-web'
+          'python-twisted-web',
+          'xauth'
 ]
 
 package { $deps: