Changeset 8227 in genesis for nodes/getrange.py

Timestamp:

Aug 4, 2010, 6:51:22 PM (14 years ago)

Author:

rick

Message:

Functional changes:

• Allow number of ranges to be requested

Cosmetic changes:

• Instead of the binary foo, use simple IP display addresses in code

• Big ranges are now only first 3 and last 3 printed

• Examples a bit cooler formatted

• Some documentation lines

File:

• nodes/getrange.py (modified) (2 diffs)

nodes/getrange.py

@@ -9 +9 @@
 size = 30
 if len(sys.argv) < 2:
-        print "Gebruik: python getrange.py <interlink|subnet> <size>"
-        print "\tdus voor een /28 interlink is het 'python getrange.py interlink 28'"
-        print "\ten voor een /25 subnet is het 'python getrange.py subnet 25'"
+        print "Gebruik: %s <interlink|subnet> <grootte> [aantal]" % sys.argv[0]
+        print "Voorbeelden:"
+        print "\tVoor drie /29 interlinks - '%s interlink 29 3'" % sys.argv[0]
+        print "\tVoor een (1) /24 subnet  - '%s subnet 24'" % sys.argv[0]
         exit(1)
 
 interlink = sys.argv[1] == 'interlink'
 size = int(sys.argv[2])
+try:
+        aantal = int(sys.argv[3])
+except (KeyError,IndexError):
+    aantal = 1
 numaddrs = 1 << (32 - size)
 
@@ -59 +64 @@
                                 print "[FOUT] in bestand '%s' regel '%i': %s" % (fname, lineNr, l)
 
-i = 0xffffffffL
+# Fetching smallest in use IP 
+# XXX: Currently not used for anything
+i = parseaddr("255.255.255.255")
 for k in bezet.keys():
         if k < i:
                 i = k
 
-i = 0xac100300
-if not interlink:
-        i = 0xac110000
-while 1:
-        while bezet.has_key(i):
-                i = i + numaddrs
-        okay = 1
-        for j in range(numaddrs):
-                if bezet.has_key(i + j):
+# Interlinks are living in special ranges usually
+if interlink:
+        i = parseaddr("172.16.3.0")
+else:
+        i = parseaddr("172.17.0.0")
+
+for n in xrange(aantal):
+        okay = False
+        while not okay: 
+                while bezet.has_key(i):
                         i = i + numaddrs
-                        okay = 0
-                        break
-        if okay:
-                break
+                
+                # Assume Ok, till we find a already used IP
+                okay = True
+                for j in range(numaddrs):
+                        if bezet.has_key(i + j):
+                                i = i + numaddrs
+                                okay = False
+                                break
 
-print "%s/%d:" % (showaddr(i), size),
-print " en ".join([showaddr(i) for i in range(i + 1, i + numaddrs - 1)])
+        print "%s/%d:" % (showaddr(i), size),
+        if size > 28:
+                print " en ".join([showaddr(i) for i in range(i + 1, i + numaddrs - 1)])
+        else:
+                print " en ".join([showaddr(i) for i in range(i + 1, i + 4)]),
+                print "...",
+                print " en ".join([showaddr(i) for i in range(i + numaddrs - 7, i + numaddrs - 4)])
+        bezet[i] = 1