Merge lp:~mpontillo/maas/commissioning-dmi-data into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Read DMI data during commissioning, for future interpretation.

[MAAS Lander (maas-lander)]

Transitioned to Git.

lp:maas has now moved from Bzr to Git.
Please propose your branches with Launchpad using Git.

git clone https://git.launchpad.net/maas

=== modified file 'src/metadataserver/models/commissioningscript.py'
--- src/metadataserver/models/commissioningscript.py	2017-01-28 00:51:47 +0000
+++ src/metadataserver/models/commissioningscript.py	2017-02-25 10:53:07 +0000
@@ -3,12 +3,13 @@
 
 """Custom commissioning scripts, and their database backing."""
 
-
 __all__ = [
     'NODE_INFO_SCRIPTS',
     'CommissioningScript',
     ]
 
+from collections import OrderedDict
+import fnmatch
 import json
 import logging
 import math
@@ -24,9 +25,11 @@
 from maasserver.models.interface import PhysicalInterface
 from maasserver.models.physicalblockdevice import PhysicalBlockDevice
 from maasserver.models.tag import Tag
+from maasserver.third_party_drivers import node_modaliases
 from metadataserver import DefaultMeta
 from metadataserver.fields import BinaryField
 from provisioningserver.refresh.node_info_scripts import (
+    DMIDECODE_OUTPUT_NAME,
     LSHW_OUTPUT_NAME,
     NODE_INFO_SCRIPTS,
 )
@@ -367,12 +370,75 @@
             id__in=delete_block_device_ids).delete()
 
 
+SWITCH_ASIC_HYPOTHESES = OrderedDict([
+    ('pci:v000014E4d0000B850sv000014E4sd0000B850bc02sc00i00', 'wedge40'),
+    ('pci:v000014E4d0000B960sv000014E4sd0000B960bc02sc00i00', 'wedge100'),
+])
+
+
+def parse_dmidecode_output(script_result: bytes):
+    KEYS_START = '-----BEGIN DMI KEYPAIRS-----'
+    KEYS_END = '-----END DMI KEYPAIRS-----'
+    output = script_result.decode('utf-8')
+    scan_keypair = False
+    dmi_data = {}
+    for line in output.splitlines():
+        # Change parser state depending on where we are in the file.
+        if line.startswith('-----') and line.strip() == KEYS_START:
+            scan_keypair = True
+            continue
+        if line.startswith('-----') and line.strip() == KEYS_END:
+            scan_keypair = False
+            continue
+        if scan_keypair:
+            kvp = line.split('=', maxsplit=1)
+            if len(kvp) == 2:
+                key, value = kvp
+                dmi_data[key] = value.strip()
+            else:
+                logger.warning("Malformed DMI key=value pair: '%s'" % line)
+    return dmi_data
+
+
+def correlate_dmidecode_details_with_detected_hardware(
+        node, output, exit_status):
+    modaliases = node_modaliases(node)
+    found_switch = False
+    possibilities = []
+    for alias, hypothesis in SWITCH_ASIC_HYPOTHESES:
+        matches = fnmatch.filter(modaliases, alias)
+        if len(matches) > 0:
+            # Found a known switch ASIC, so add the 'switch' tag.
+            found_switch = True
+            possibilities.add(hypothesis)
+    if found_switch:
+        switch, _ = Tag.objects.get_or_create(name='switch')
+    from pprint import pprint
+    # XXX: Temporary debug code to print the DMI data we found.
+    pprint({
+        "hostname": node.hostname,
+        "modaliases": modaliases,
+        "dmidecode_output": output,
+        "status": exit_status,
+        "dmi_data": parse_dmidecode_output(output)
+    })
+    # XXX: Should we store the dmi_data somewhere? (Future branch.)
+    # XXX: If more than one possibility matched, narrow it down.
+    if len(possibilities) == 1:
+        # Narrowed it down to one possible device type we care about, so
+        # let's get it tagged!
+        model_string = possibilities[0]
+        model, _ = Tag.objects.get_or_create(name=model_string)
+
 # Register the post processing hooks.
 NODE_INFO_SCRIPTS[LSHW_OUTPUT_NAME]['hook'] = update_hardware_details
 NODE_INFO_SCRIPTS['00-maas-01-cpuinfo']['hook'] = parse_cpuinfo
 NODE_INFO_SCRIPTS['00-maas-02-virtuality']['hook'] = set_virtual_tag
 NODE_INFO_SCRIPTS['00-maas-07-block-devices']['hook'] = (
     update_node_physical_block_devices)
+NODE_INFO_SCRIPTS[DMIDECODE_OUTPUT_NAME]['hook'] = (
+    correlate_dmidecode_details_with_detected_hardware
+)
 NODE_INFO_SCRIPTS['99-maas-03-network-interfaces']['hook'] = (
     update_node_network_information)
 NODE_INFO_SCRIPTS['99-maas-04-network-interfaces-with-sriov']['hook'] = (

=== modified file 'src/provisioningserver/refresh/node_info_scripts.py'
--- src/provisioningserver/refresh/node_info_scripts.py	2017-02-17 14:23:04 +0000
+++ src/provisioningserver/refresh/node_info_scripts.py	2017-02-25 10:53:07 +0000
@@ -16,11 +16,11 @@
 import os
 from textwrap import dedent
 
-# Name of the file where the node info scripts store lshw output.
+# Well-known commissioning script names. (Used for locating commissioning
+# script output.)
 LSHW_OUTPUT_NAME = '00-maas-01-lshw'
-
-# Name of the file where the node info scripts store LLDP output.
 LLDP_OUTPUT_NAME = '99-maas-02-capture-lldp'
+DMIDECODE_OUTPUT_NAME = '00-maas-08-dmidecode'
 
 
 def make_function_call_script(function, *args, **kwargs):
@@ -108,6 +108,59 @@
     done
     """)
 
+DMIDECODE_SCRIPT = dedent("""\
+    #!/bin/bash
+
+    OUTFILE=/root/dmi.bin
+
+    # Some platforms won't be able to dump the DMI data (such as non-Intel), so
+    # exit gracefully if this fails.
+    dmidecode -u --dump-bin $OUTFILE && (
+        echo "-----BEGIN DMI DATA-----" ;
+        base64 $OUTFILE
+        echo "-----END DMI DATA-----"
+    ) || (echo "Unable to read DMI information."; exit 0)
+
+    echo ""
+    echo "-----BEGIN FULL DMI DECODE-----"
+    dmidecode -u --from-dump $OUTFILE
+    echo "-----END FULL DMI DECODE-----"
+
+    # See http://git.savannah.nongnu.org/cgit/dmidecode.git/tree/dmiopt.c#n142
+    DMI_STRINGS="
+        bios-vendor
+        bios-version
+        bios-release-date
+        system-manufacturer
+        system-product-name
+        system-version
+        system-serial-number
+        system-uuid
+        baseboard-manufacturer
+        baseboard-product-name
+        baseboard-version
+        baseboard-serial-number
+        baseboard-asset-tag
+        chassis-manufacturer
+        chassis-type
+        chassis-version
+        chassis-serial-number
+        chassis-asset-tag
+        processor-family
+        processor-manufacturer
+        processor-version
+        processor-frequency
+    "
+
+    echo ""
+    echo "-----BEGIN DMI KEYPAIRS-----"
+    for key in $DMI_STRINGS; do
+        value=$(dmidecode --from-dump $OUTFILE -s $key)
+        printf "%s=%s\\n" "$key" "$(echo $value | tr '\\n' ' ')"
+    done
+    echo "-----END DMI KEYPAIRS-----"
+    """)
+
 
 # Run `dhclient` on all the unconfigured interfaces.
 # This is done to create records in the leases file for the
@@ -429,6 +482,13 @@
         'hook': null_hook,
         'run_on_controller': True,
     }),
+    (DMIDECODE_OUTPUT_NAME, {
+        'content': DMIDECODE_SCRIPT.encode('ascii'),
+        'hook': null_hook,
+        # Note: while it would be nice to run this on the controller, dmidecode
+        # requires root priveleges, so it's not currently useful.
+        'run_on_controller': False,
+    }),
     ('99-maas-01-wait-for-lldpd', {
         'content': make_function_call_script(
             lldpd_wait, "/var/run/lldpd.socket", time_delay=60),