Fix address comparison for older versions of Python3.5

cnp3 · Aug 7, 2019 · d735a6b · d735a6b
1 parent 50bd367
commit d735a6b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/ipmininet/link.py b/ipmininet/link.py
@@ -297,10 +297,18 @@ def address_comparator(a, b):
         return 1
     if b.network.is_global and not a.network.is_global:
         return -1
-    # Otherwise simply rank the IP values
-    if a > b:
+    # Compare networks
+    if b.network.is_global and not a.network.is_global:
+        return -1
+    # Compare network values
+    if a.network < b.network:
+        return -1
+    if a.network > b.network:
         return 1
-    return -1 if b > a else 0
+    # Otherwise simply rank the IP values
+    if a.ip < b.ip:
+        return -1
+    return 1 if a.ip > b.ip else 0
 
 
 class PhysicalInterface(IPIntf):

diff --git a/ipmininet/tests/test_link.py b/ipmininet/tests/test_link.py
@@ -21,6 +21,10 @@
      [u"100.64.0.1/32", u"10.0.0.1/8"]),  # Public before private
     ([u"100.64.0.1/32", u"10.0.0.1/8"],
      [u"100.64.0.1/32", u"10.0.0.1/8"]),  # Public before private
+    ([u"2001::1/16", u"2002::1/16"],
+     [u"2002::1/16", u"2001::1/16"]),  # Bigger network value first
+    ([u"2002::1/16", u"2001::1/16"],
+     [u"2002::1/16", u"2001::1/16"]),  # Bigger network value first
     ([u"2001::1/16", u"2001::2/16"],
      [u"2001::2/16", u"2001::1/16"]),  # Bigger IP value first
     ([u"2001::2/16", u"2001::1/16"],