Patch to make findks work based on MAC address

[Carsten Clasohm]

Attached is a patch for 
/usr/lib/python2.4/site-packages/cobbler/services.py, which allows 
findks to match based on the MAC address.

The patch is relative to the version from

http://git.fedoraproject.org/git/?p=cobbler;a=commit;h=482d5494c13f1fbeb5...



--- services.py.git     2008-07-21 13:23:16.000000000 +0200
+++ services.py 2008-07-21 14:19:47.000000000 +0200
@@ -93,2 +93,2 @@
         self.__xmlrpc_setup()
         systems = self.remote.get_systems()

+        candidates = []
+
         # if kssendmac was in the kernel options line, see
         # if a system can be found matching the MAC address.  This
         # is more specific than an IP match.
@@ -101,3 +103,13 @@
         if macinput is not None:
             # FIXME: will not key off other NICs, problem?
             mac = macinput.split()[1].strip()
+
+            for x in systems:
+                for y in x["interfaces"]:
+                    if x["interfaces"][y]["mac_address"].lower() ==
mac.lower():
+                        candidates.append(x)
+
+            if len(candidates) > 1:
+                return "FAILED: multiple matches based on MAC"
+            elif len(candidates) == 1:
+                return candidates[0]["name"]

         ip = rest["REMOTE_ADDR"]

-        candidates = []
         for x in systems:
             for y in x["interfaces"]:
                 if x["interfaces"][y]["ip_address"] == ip:
@@ -113,6 +124,6 @@
         if len(candidates) == 0:
             return "FAILED: no match (%s,%s)" % (ip, macinput)
         elif len(candidates) > 1:
-            return "FAILED: multiple matches"
+            return "FAILED: multiple matches based on IP"
         elif len(candidates) == 1:
             return candidates[0]["name"]

[Michael DeHaan]

On Mon, 2008-07-21 at 14:54 +0200, Carsten Clasohm wrote:
>  Attached is a patch for 
>  /usr/lib/python2.4/site-packages/cobbler/services.py, which allows 
>  findks to match based on the MAC address. 
I've applied this with a slight change -- namely that it will not do IP
detection if it clears MAC detection, if both are in cobbler we do not
want it to fail, but instead match on first available.

Looking at my code here, at some point, we can update this to use the
cobbler "find" API calls versus iterating through them here, but it's
not really going to be any faster so this is ok.

--Michael

[Carsten Clasohm]

Michael DeHaan wrote:
>  I've applied this with a slight change -- namely that it will not
> do IP
>  detection if it clears MAC detection, if both are in cobbler we do not
>  want it to fail, but instead match on first available. 
There's a small bug in your cobbler/services.py, which prevents 
MAC-based findks from working. Attached is a patch to fix this.


Carsten


--- cobbler/cobbler/services.py	2008-07-22 09:49:30.000000000 +0200
+++ services.py	2008-07-22 10:00:44.000000000 +0200
@@ -102,7 +102,7 @@
             # FIXME: will not key off other NICs, problem?
             mac = macinput.split()[1].strip()
         else:
-            macinput = "None"
+            mac = "None"
 
         ip = rest["REMOTE_ADDR"]
 
@@ -110,7 +110,7 @@
 
         for x in systems:
             for y in x["interfaces"]:
-                if x["interfaces"][y]["mac_address"].lower() ==
macinput.lower():
+                if x["interfaces"][y]["mac_address"].lower() ==
mac.lower():
                     candidates.append(x)
 
         if len(candidates) == 0:

[Michael DeHaan]

Carsten Clasohm wrote:
>  Michael DeHaan wrote:
> > I've applied this with a slight change -- namely that it will not do IP
> > detection if it clears MAC detection, if both are in cobbler we do not
> > want it to fail, but instead match on first available.
>
>  There's a small bug in your cobbler/services.py, which prevents 
>  MAC-based findks from working. Attached is a patch to fix this.
>
>
>  Carsten
>  
Absolutely correct, applied!

(I should have tested this from Anaconda as well as the browser.  Lesson 
learned.)

--Michael