Changeset 9462a1ee61cb7c69c57720d39360f2d0765578a5

Timestamp:

05/31/10 10:39:01 (21 months ago)

Author:

Frederic Lepied <frederic.lepied@…>

Children:

72d673f0c5d7aa426dcd9ce67099813d1c7972d4

Parents:

17c79627d5d4c95f2428c5e361f8f06b64257983

git-committer:

Frederic Lepied <frederic.lepied@…> (05/31/10 10:39:01)

Message:

allow to lookup system by MAC or IPV4

Files:

• pxe/dpysystem (modified) (4 diffs)

pxe/dpysystem

@@ -3 +3 @@
 # Project         : pxemngr
 # File            : dpysystem
-# Copyright       : 2009 Splitted-Desktop Systems
+# Copyright       : 2009-2010 Splitted-Desktop Systems
 # Author          : Frederic Lepied
 # Created On      : Sun Feb  1 13:54:41 2009
-# Purpose         : report the list of systems or informations
-#                 about one system.
 #---------------------------------------------------------------
+
+"""Reports the list of systems or displays informations about one system."""
 
 import sys
@@ -16 +16 @@
 
 if len(sys.argv) != 2:
-    error('Usage: %s <system name>|-l' % sys.argv[0])
+    error('Usage: %s <system name|MAC|IPV4>|-l' % sys.argv[0])
 
 if sys.argv[1] == '-l':
@@ -25 +25 @@
         system = System.objects.get(name=sys.argv[1])
     except System.DoesNotExist:
-        error('System %s not defined' % sys.argv[1])
+        try:
+            if len(sys.argv[1]) == 17:
+                system = System.objects.get(macaddress__mac=simplify_mac(sys.argv[1]))
+            else:
+                if '.' in sys.argv[1]:
+                    system = System.objects.get(macaddress__mac=simplify_ip(sys.argv[1]))
+                else:
+                    system = System.objects.get(macaddress__mac=sys.argv[1].upper())
+        except System.DoesNotExist:
+            error('System %s not defined' % sys.argv[1])
     
     print 'Name:', system.name
@@ -32 +41 @@
         print 'Mac:',
         r = ''
-        for i in range(0, 10, 2):
-            r = r +  '%s:' % mac.mac[i:i+2]
-        r = r + mac.mac[10:12]
-        print '%s (%s)' % (r, mac_to_ip(r))
-    
+        if len(mac.mac) == 12:
+            for i in range(0, 10, 2):
+                r = r +  '%s:' % mac.mac[i:i+2]
+            r = r + mac.mac[10:12]
+            print '%s (%s)' % (r, mac_to_ip(r))
+        else:
+            l = len(mac.mac)
+            for i in range(0, l - 2, 2):
+                r = r +  '%d.' % int(mac.mac[i:i+2], 16)
+            r = r +  '%d (%s)' % (int(mac.mac[l-2:l], 16), mac.mac)
+            print r
+            
     logs = Log.objects.filter(system=system).order_by('-date')
     if len(logs) >= 1: