Revision e0cfcdd5

View differences:

bin/mn
81 81
        self.parseArgs()
82 82
        self.setup()
83 83
        self.begin()
84
  
84

  
85 85
    def setCustom( self, name, value ):
86
        print "got", self, name, value
86
        "Set custom parameters for MininetRunner."
87 87
        if name in ( 'topos', 'switches', 'hosts', 'controllers' ):
88 88
            # Update dictionaries
89 89
            param = name.upper()
......
94 94
        else:
95 95
            # Add or modify global variable or class
96 96
            globals()[ name ] = value
97
        
97

  
98 98
    def parseCustomFile( self, fileName ):
99 99
        "Parse custom file and add params before parsing cmd-line options."
100 100
        custom = {}
......
104 104
                self.setCustom( name, custom[ name ] )
105 105
        else:
106 106
            raise Exception( 'could not find custom file: %s' % fileName )
107
        
107

  
108 108
    def parseArgs( self ):
109 109
        """Parse command-line args and return options object.
110 110
           returns: opts parse options dict"""
mininet/cli.py
91 91
        for switch in self.mn.switches:
92 92
            info( '%s <->', switch.name )
93 93
            for intf in switch.intfs:
94
                node, name = switch.connection[ intf ]
95
                info( ' %s' % node.name )
94
                name = switch.connection[ intf ][ 1 ]
95
                info( ' %s' % name )
96 96
            info( '\n' )
97 97

  
98 98
    def do_sh( self, args ):

Also available in: Unified diff