From d7e5dfc5b60fabbcd213707eed214469e15ddcac Mon Sep 17 00:00:00 2001 From: Bob Lantz Date: Mon, 12 Mar 2012 00:20:26 -0700 Subject: [PATCH] Minor tweaks: specify port, new repr() --- mininet/link.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mininet/link.py b/mininet/link.py index e0bd36e..6bf619b 100644 --- a/mininet/link.py +++ b/mininet/link.py @@ -33,7 +33,7 @@ class Intf( object ): "Basic interface object that can configure itself." - def __init__( self, name, node=None, link=None, **kwargs ): + def __init__( self, name, node=None, port=None, link=None, **kwargs ): """name: interface name (e.g. h1-eth0) node: owning node (where this intf most likely lives) link: parent link if we're part of a link @@ -43,7 +43,7 @@ class Intf( object ): self.link = link self.mac, self.ip, self.prefixLen = None, None, None # Add to node (and move ourselves if necessary ) - node.addIntf( self ) + node.addIntf( self, port=port ) self.config( **kwargs ) def cmd( self, *args, **kwargs ): @@ -163,6 +163,9 @@ class Intf( object ): # Does it help to sleep to let things run? sleep( 0.001 ) + def __repr__( self ): + return '<%s %s>' % ( self.__class__.__name__, self.name ) + def __str__( self ): return self.name @@ -339,8 +342,10 @@ class Link( object ): if not params2: params2 = {} - intf1 = cls1( name=intfName1, node=node1, link=self, **params1 ) - intf2 = cls2( name=intfName2, node=node2, link=self, **params2 ) + intf1 = cls1( name=intfName1, node=node1, port=port1, + link=self, **params1 ) + intf2 = cls2( name=intfName2, node=node2, port=port2, + link=self, **params2 ) # All we are is dust in the wind, and our two interfaces self.intf1, self.intf2 = intf1, intf2