Revision dc630c54 mininet/node.py

View differences:

mininet/node.py
54 54
    def __init__( self, name, inNamespace=True ):
55 55
        self.name = name
56 56
        closeFds = False # speed vs. memory use
57
        # xpgEcho is needed so we can echo our sentinel in sendCmd
57
        # xpg_echo is needed so we can echo our sentinel in sendCmd
58 58
        cmd = [ '/bin/bash', '-O', 'xpg_echo' ]
59 59
        self.inNamespace = inNamespace
60 60
        if self.inNamespace:
......
170 170
        """Send a command, wait for output, and return it.
171 171
           cmd: string"""
172 172
        log = info if verbose else debug
173
        log( '*** %s : %s', self.name, cmd )
173
        log( '*** %s : %s\n' % ( self.name, cmd ) )
174 174
        self.sendCmd( cmd )
175 175
        return self.waitOutput( verbose )
176 176

  
......
261 261
    # Other methods
262 262
    def __str__( self ):
263 263
        result = self.name + ':'
264
        result += ' IP=' + repr( self.IP() )
264
        result += ' IP=' + str( self.IP() )
265 265
        result += ' intfs=' + ','.join( sorted( self.intfs.values() ) )
266
        result += ' waiting=' + repr( self.waiting )
266
        result += ' waiting=' + str( self.waiting )
267 267
        return result
268 268

  
269 269

  

Also available in: Unified diff