Ignore link info when sorting links.

lantz · lantz · commit 8dea57d2711d · 2014-11-03T14:20:01.000-08:00
diff --git a/mininet/topo.py b/mininet/topo.py
@@ -203,7 +203,11 @@ def links( self, sort=False, withKeys=False, withInfo=False ):
            withInfo: return link info
            returns: list of ( src, dst [,key, info ] )"""
         links = list( self.iterLinks( withKeys, withInfo ) )
-        return links if not sort else self.sorted( links )
+        if not sorted:
+            return links
+        # Ignore info when sorting
+        tupleSize = 3 if withKeys else 2
+        return sorted( links, key=( lambda l: naturalSeq( l[ 0 : tupleSize ] ) ) )
 
     # This legacy port management mechanism is clunky and will probably
     # be removed at some point.
