Merge lp:~andreserl/maas/maas_detect_ipmi_bug1064527 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Improve detect_ipmi to avoid trying to detect IPMI if host is a virtual CPU

[Gavin Panella (allenap)]

[1]

+       f = open('/proc/cpuinfo', 'r')
+       cpu_info = f.readlines()
+       f.close()
+       for line in cpu_info:
+           if line.startswith('model name') and 'QEMU' in line:
+               return (False, None)

The idiomatic way to do this in recent Python versions is:

       with open('/proc/cpuinfo', 'r') as fd:
           for line in fd:
               if line.startswith('model name') and 'QEMU' in line:
                   return (False, None)

Same for the other copy-n-pasted version of this function :-/

review: Needs Fixing

[Andres Rodriguez (andreserl)]

Hi Gavin,

Thanks for the review. I updated the branch to display the idiomatic as recommended.

Regards.

[Gavin Panella (allenap)]

review: Approve

[Julian Edwards (julian-edwards)]

On 10/04/13 06:41, Gavin Panella wrote:
> Same for the other copy-n-pasted version of this function :-/

Andres, I hate to say I told you so, but.... this really needs factoring.

[MAAS Lander (maas-lander)]

No commit message specified.

=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata	2013-04-08 19:56:51 +0000
+++ contrib/preseeds_v2/enlist_userdata	2013-04-09 21:28:22 +0000
@@ -66,7 +66,13 @@
    import json
 
    def detect_ipmi():
-       # TODO: Detection could be improved.
+       # XXX: andreserl 2013-04-09 bug=1064527: Try to detect if node
+       # is a Virtual Machine. If it is, do not try to detect IPMI.
+       with open('/proc/cpuinfo', 'r') as cpuinfo:
+           for line in cpuinfo:
+               if line.startswith('model name') and 'QEMU' in line:
+                   return (False, None)
+
        (status, output) = commands.getstatusoutput('ipmi-locate')
        show_re = re.compile('(IPMI\ Version:) (\d\.\d)')
        res = show_re.search(output)
 
=== modified file 'src/metadataserver/commissioning/user_data.template'
--- src/metadataserver/commissioning/user_data.template	2013-04-08 19:56:51 +0000
+++ src/metadataserver/commissioning/user_data.template	2013-04-09 21:28:22 +0000
@@ -229,7 +229,13 @@
 import time
 
 def detect_ipmi():
-    # TODO: Detection could be improved.
+    # XXX: andreserl 2013-04-09 bug=1064527: Try to detect if node
+    # is a Virtual Machine. If it is, do not try to detect IPMI.
+    with open('/proc/cpuinfo', 'r') as cpuinfo:
+        for line in cpuinfo:
+            if line.startswith('model name') and 'QEMU' in line:
+                return (False, None)
+
     (status, output) = commands.getstatusoutput('ipmi-locate')
     show_re = re.compile('(IPMI\ Version:) (\d\.\d)')
     res = show_re.search(output)