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

[Andres Rodriguez]

Consolidate the maas-ipmi-autodetect script by separating it from the preseeds (user_data.template, enlist_userdata) into its own snippet, and allowing the enlistment context to be able to access the commissioning snippets.

Additionally fix test_render_preseed and test_render_enlistment_preseed to reflect testing
the correct templates.

[Jeroen T. Vermeulen (jtv)]

Thanks for doing this. It's great to see so much duplication disappear! It may even make it easier, if we ever get to that, to write unit-tests for the code inside the user data.

I always try to come up with a few remarks. The test for get_snippet_context is the right thing to do; it's short but probably only because it's well-written. But it'd be nice to have a negative test as well, to ensure that the function doesn't return things that it shouldn't. But that's no reason to stop this branch from landing. If you like I could write one for you afterwards.

Another note is that Python docstrings normally start with a description in the imperative. So where your docstrings start with "Returns [something]" the preferred form is "Return [something]." Not urgent.

One other small thing that I would prefer you to change: with values that aren't booleans, explicit comparisons are clearer and more robust than evaluating them directly as Booleans. So in get_snippet_context, it's better to write "if snippets_dir is None:" than to write "if not snippets_dir:". It produces more easily predictable behaviour in edge cases or failure scenarios, such as empty strings.

Jeroen

review: Approve

[Andres Rodriguez (andreserl)]

Addressed comments and approving this branch for it to land.

review: Approve

[MAAS Lander (maas-lander)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-trunk/319/console reported an error when processing this lp:~andreserl/maas/consolidate_maas_ipmi_autodetect branch.
Not merging it.

[Andres Rodriguez (andreserl)]

review: Approve

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata	2013-05-22 17:10:37 +0000
+++ contrib/preseeds_v2/enlist_userdata	2013-06-12 17:17:25 +0000
@@ -55,147 +55,7 @@
    END_IPMI_CONFIG
 
    add_bin "maas-ipmi-autodetect" <<"END_MAAS_IPMI_AUTODETECT"
-   #!/usr/bin/python
-   import os
-   import commands
-   import glob
-   import re
-   import string
-   import random
-   import time
-   import json
-
-   def detect_ipmi():
-       # 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)
-       if res == None:
-           found = glob.glob("/dev/ipmi[0-9]")
-           if len(found):
-               return (True, "UNKNOWN: %s" % " ".join(found))
-           return (False, "")
-       return (True, res.group(2))
-
-   def is_ipmi_dhcp():
-       (status, output) = commands.getstatusoutput('bmc-config --checkout --key-pair="Lan_Conf:IP_Address_Source"')
-       show_re = re.compile('IP_Address_Source\s+Use_DHCP')
-       res = show_re.search(output)
-       if res == None:
-           return False
-       return True
-
-   def set_ipmi_network_source(source):
-       (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="Lan_Conf:IP_Address_Source=%s"' % source)
-
-   def get_ipmi_ip_address():
-       (status, output) = commands.getstatusoutput('bmc-config --checkout --key-pair="Lan_Conf:IP_Address"')
-       show_re = re.compile('([0-9]{1,3}[.]?){4}')
-       res = show_re.search(output)
-       return res.group()
-
-   def get_ipmi_user_number(user):
-       for i in range(1, 17):
-           ipmi_user_number = "User%s" % i
-           (status, output) = commands.getstatusoutput('bmc-config --checkout --key-pair="%s:Username"' % ipmi_user_number)
-           if user in output:
-               return ipmi_user_number
-       return None
-
-   def commit_ipmi_user_settings(user, password):
-       ipmi_user_number = get_ipmi_user_number(user)
-       if ipmi_user_number is None:
-           (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="User10:Username=%s"' % user)
-           ipmi_user_number = get_ipmi_user_number(user)
-       (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Username=%s"' % (ipmi_user_number, user))
-       (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Password=%s"' % (ipmi_user_number, password))
-       (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Enable_User=Yes"' % ipmi_user_number)
-       (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Lan_Enable_IPMI_Msgs=Yes"' % ipmi_user_number)
-       (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Lan_Privilege_Limit=Administrator"' % ipmi_user_number)
-
-   def commit_ipmi_settings(config):
-       (status, output) = commands.getstatusoutput('bmc-config --commit --filename %s' % config)
-
-   def get_maas_power_settings(user, password, ipaddress):
-       return "%s,%s,%s" % (user, password, ipaddress)
-
-   def get_maas_power_settings_json(user, password, ipaddress):
-       power_params = {"power_address": ipaddress, "power_pass": password, "power_user": user}
-       return json.dumps(power_params) 
-
-   def generate_random_password(min=8,max=15):
-       length=random.randint(min,max)
-       letters=string.ascii_letters+string.digits
-       return ''.join([random.choice(letters) for _ in range(length)])
-
-   def main():
-
-       import argparse
-
-       parser = argparse.ArgumentParser(
-           description='send config file to modify IPMI settings with')
-       parser.add_argument("--configdir", metavar="folder",
-           help="specify config file directory", default=None)
-       parser.add_argument("--dhcp-if-static", action="store_true",
-           dest="dhcp", help="set network source to DHCP if Static", default=False)
-       parser.add_argument("--commission-creds", action="store_true",
-           dest="commission_creds", help="Create IPMI temporary credentials", default=False)
-
-       args = parser.parse_args()
-
-       # Check whether IPMI exists or not.
-       (status, ipmi_version) = detect_ipmi()
-       if status != True:
-           # if False, then failed to detect ipmi
-           exit(1)
-
-       # Check whether IPMI is being set to DHCP. If it is not, and
-       # '--dhcp-if-static' has been passed,  Set it to IPMI to DHCP.
-       if not is_ipmi_dhcp() and args.dhcp:
-           set_ipmi_network_source("Use_DHCP")
-           # allow IPMI 120 seconds to obtain an IP address
-           time.sleep(120)
-
-       # create user/pass
-       IPMI_MAAS_USER="maas"
-       IPMI_MAAS_PASSWORD=generate_random_password()
-
-       # Configure IPMI user/password
-       commit_ipmi_user_settings(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD)
-
-       # Commit other IPMI settings
-       if args.configdir:
-           for file in os.listdir(args.configdir):
-               commit_ipmi_settings(os.path.join(args.configdir, file))
-
-       # get the IP address
-       IPMI_IP_ADDRESS = get_ipmi_ip_address()
-       if IPMI_IP_ADDRESS == "0.0.0.0":
-           # if IPMI_IP_ADDRESS is 0.0.0.0, wait 60 seconds and retry.
-           set_ipmi_network_source("Static")
-           time.sleep(2)
-           set_ipmi_network_source("Use_DHCP")
-           time.sleep(60)
-           IPMI_IP_ADDRESS = get_ipmi_ip_address()
-
-       if IPMI_IP_ADDRESS is None or IPMI_IP_ADDRESS == "0.0.0.0":
-           # Exit (to not set power params in MAAS) if no IPMI_IP_ADDRESS
-           # has been detected
-           exit(1)
-
-       if args.commission_creds:
-           print get_maas_power_settings_json(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD, IPMI_IP_ADDRESS)
-       else:
-           print get_maas_power_settings(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD, IPMI_IP_ADDRESS)
-
-   if __name__ == '__main__':
-       main()
+   {{maas_ipmi_autodetect_py}}
    END_MAAS_IPMI_AUTODETECT
 
    # we could obtain the interface that booted from the kernel cmdline

=== added file 'etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py'
--- etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py	1970-01-01 00:00:00 +0000
+++ etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py	2013-06-12 17:17:25 +0000
@@ -0,0 +1,161 @@
+#!/usr/bin/python
+#
+# maas-ipmi-autodetect - autodetect and autoconfigure IPMI.
+#
+# Copyright (C) 2011-2013 Canonical
+#
+# Authors:
+#    Andres Rodriguez <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import commands
+import glob
+import re
+import string
+import random
+import time
+import json
+
+def detect_ipmi():
+    # 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)
+    if res == None:
+        found = glob.glob("/dev/ipmi[0-9]")
+        if len(found):
+            return (True, "UNKNOWN: %s" % " ".join(found))
+        return (False, "")
+    return (True, res.group(2))
+
+def is_ipmi_dhcp():
+    (status, output) = commands.getstatusoutput('bmc-config --checkout --key-pair="Lan_Conf:IP_Address_Source"')
+    show_re = re.compile('IP_Address_Source\s+Use_DHCP')
+    res = show_re.search(output)
+    if res == None:
+        return False
+    return True
+
+def set_ipmi_network_source(source):
+    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="Lan_Conf:IP_Address_Source=%s"' % source)
+
+def get_ipmi_ip_address():
+    (status, output) = commands.getstatusoutput('bmc-config --checkout --key-pair="Lan_Conf:IP_Address"')
+    show_re = re.compile('([0-9]{1,3}[.]?){4}')
+    res = show_re.search(output)
+    return res.group()
+
+def get_ipmi_user_number(user):
+    for i in range(1, 17):
+        ipmi_user_number = "User%s" % i
+        (status, output) = commands.getstatusoutput('bmc-config --checkout --key-pair="%s:Username"' % ipmi_user_number)
+        if user in output:
+            return ipmi_user_number
+    return None
+
+def commit_ipmi_user_settings(user, password):
+    ipmi_user_number = get_ipmi_user_number(user)
+    if ipmi_user_number is None:
+        (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="User10:Username=%s"' % user)
+        ipmi_user_number = get_ipmi_user_number(user)
+    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Username=%s"' % (ipmi_user_number, user))
+    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Password=%s"' % (ipmi_user_number, password))
+    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Enable_User=Yes"' % ipmi_user_number)
+    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Lan_Enable_IPMI_Msgs=Yes"' % ipmi_user_number)
+    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Lan_Privilege_Limit=Administrator"' % ipmi_user_number)
+
+def commit_ipmi_settings(config):
+    (status, output) = commands.getstatusoutput('bmc-config --commit --filename %s' % config)
+
+def get_maas_power_settings(user, password, ipaddress):
+    return "%s,%s,%s" % (user, password, ipaddress)
+
+def get_maas_power_settings_json(user, password, ipaddress):
+    power_params = {"power_address": ipaddress, "power_pass": password, "power_user": user}
+    return json.dumps(power_params) 
+
+def generate_random_password(min=8,max=15):
+    length=random.randint(min,max)
+    letters=string.ascii_letters+string.digits
+    return ''.join([random.choice(letters) for _ in range(length)])
+
+def main():
+
+    import argparse
+
+    parser = argparse.ArgumentParser(
+        description='send config file to modify IPMI settings with')
+    parser.add_argument("--configdir", metavar="folder",
+        help="specify config file directory", default=None)
+    parser.add_argument("--dhcp-if-static", action="store_true",
+        dest="dhcp", help="set network source to DHCP if Static", default=False)
+    parser.add_argument("--commission-creds", action="store_true",
+        dest="commission_creds", help="Create IPMI temporary credentials", default=False)
+
+    args = parser.parse_args()
+
+    # Check whether IPMI exists or not.
+    (status, ipmi_version) = detect_ipmi()
+    if status != True:
+        # if False, then failed to detect ipmi
+        exit(1)
+
+    # Check whether IPMI is being set to DHCP. If it is not, and
+    # '--dhcp-if-static' has been passed,  Set it to IPMI to DHCP.
+    if not is_ipmi_dhcp() and args.dhcp:
+        set_ipmi_network_source("Use_DHCP")
+        # allow IPMI 120 seconds to obtain an IP address
+        time.sleep(120)
+
+    # create user/pass
+    IPMI_MAAS_USER="maas"
+    IPMI_MAAS_PASSWORD=generate_random_password()
+
+    # Configure IPMI user/password
+    commit_ipmi_user_settings(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD)
+
+    # Commit other IPMI settings
+    if args.configdir:
+        for file in os.listdir(args.configdir):
+            commit_ipmi_settings(os.path.join(args.configdir, file))
+
+    # get the IP address
+    IPMI_IP_ADDRESS = get_ipmi_ip_address()
+    if IPMI_IP_ADDRESS == "0.0.0.0":
+        # if IPMI_IP_ADDRESS is 0.0.0.0, wait 60 seconds and retry.
+        set_ipmi_network_source("Static")
+        time.sleep(2)
+        set_ipmi_network_source("Use_DHCP")
+        time.sleep(60)
+        IPMI_IP_ADDRESS = get_ipmi_ip_address()
+
+    if IPMI_IP_ADDRESS is None or IPMI_IP_ADDRESS == "0.0.0.0":
+        # Exit (to not set power params in MAAS) if no IPMI_IP_ADDRESS
+        # has been detected
+        exit(1)
+
+    if args.commission_creds:
+        print get_maas_power_settings_json(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD, IPMI_IP_ADDRESS)
+    else:
+        print get_maas_power_settings(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD, IPMI_IP_ADDRESS)
+
+if __name__ == '__main__':
+    main()

=== modified file 'etc/maas/templates/commissioning-user-data/user_data.template'
--- etc/maas/templates/commissioning-user-data/user_data.template	2013-06-04 00:04:30 +0000
+++ etc/maas/templates/commissioning-user-data/user_data.template	2013-06-12 17:17:25 +0000
@@ -219,137 +219,7 @@
 END_IPMI_CONFIG
 
 add_bin "maas-ipmi-autodetect" <<"END_MAAS_IPMI_AUTODETECT"
-#!/usr/bin/python
-import os
-import commands
-import glob
-import re
-import string
-import random
-import time
-
-def detect_ipmi():
-    # 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)
-    if res == None:
-        found = glob.glob("/dev/ipmi[0-9]")
-        if len(found):
-            return (True, "UNKNOWN: %s" % " ".join(found))
-        return (False, "")
-    return (True, res.group(2))
-
-def is_ipmi_dhcp():
-    (status, output) = commands.getstatusoutput('bmc-config --checkout --key-pair="Lan_Conf:IP_Address_Source"')
-    show_re = re.compile('IP_Address_Source\s+Use_DHCP')
-    res = show_re.search(output)
-    if res == None:
-        return False
-    return True
-
-def set_ipmi_network_source(source):
-    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="Lan_Conf:IP_Address_Source=%s"' % source)
-
-def get_ipmi_ip_address():
-    (status, output) = commands.getstatusoutput('bmc-config --checkout --key-pair="Lan_Conf:IP_Address"')
-    show_re = re.compile('([0-9]{1,3}[.]?){4}')
-    res = show_re.search(output)
-    return res.group()
-
-def get_ipmi_user_number(user):
-    for i in range(1, 17):
-        ipmi_user_number = "User%s" % i
-        (status, output) = commands.getstatusoutput('bmc-config --checkout --key-pair="%s:Username"' % ipmi_user_number)
-        if user in output:
-            return ipmi_user_number
-    return None
-
-def commit_ipmi_user_settings(user, password):
-    ipmi_user_number = get_ipmi_user_number(user)
-    if ipmi_user_number is None:
-        (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="User10:Username=%s"' % user)
-        ipmi_user_number = get_ipmi_user_number(user)
-    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Username=%s"' % (ipmi_user_number, user))
-    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Password=%s"' % (ipmi_user_number, password))
-    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Enable_User=Yes"' % ipmi_user_number)
-    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Lan_Enable_IPMI_Msgs=Yes"' % ipmi_user_number)
-    (status, output) = commands.getstatusoutput('bmc-config --commit --key-pair="%s:Lan_Privilege_Limit=Administrator"' % ipmi_user_number)
-
-def commit_ipmi_settings(config):
-    (status, output) = commands.getstatusoutput('bmc-config --commit --filename %s' % config)
-
-def get_maas_power_settings(user, password, ipaddress):
-    return "%s,%s,%s" % (user, password, ipaddress)
-
-def generate_random_password(min=8,max=15):
-    length=random.randint(min,max)
-    letters=string.ascii_letters+string.digits
-    return ''.join([random.choice(letters) for _ in range(length)])
-
-def main():
-
-    import argparse
-
-    parser = argparse.ArgumentParser(
-        description='send config file to modify IPMI settings with')
-    parser.add_argument("--configdir", metavar="folder",
-        help="specify config file", default=None)
-    parser.add_argument("--dhcp-if-static", action="store_true",
-        dest="dhcp", help="specify config file", default=False)
-
-    args = parser.parse_args()
-
-    # Check whether IPMI exists or not.
-    (status, ipmi_version) = detect_ipmi()
-    if status != True:
-        # if False, then failed to detect ipmi
-        exit(1)
-
-    # Check whether IPMI is being set to DHCP. If it is not, and
-    # '--dhcp-if-static' has been passed,  Set it to IPMI to DHCP.
-    if not is_ipmi_dhcp() and args.dhcp:
-        set_ipmi_network_source("Use_DHCP")
-        # allow IPMI 120 seconds to obtain an IP address
-        time.sleep(120)
-
-    # create user/pass
-    IPMI_MAAS_USER="maas"
-    IPMI_MAAS_PASSWORD=generate_random_password()
-
-    # Configure IPMI user/password
-    commit_ipmi_user_settings(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD)
-
-    # Commit other IPMI settings
-    if args.configdir:
-        for file in os.listdir(args.configdir):
-            commit_ipmi_settings(os.path.join(args.configdir, file))
-
-    # get the IP address
-    IPMI_IP_ADDRESS = get_ipmi_ip_address()
-    if IPMI_IP_ADDRESS == "0.0.0.0":
-        # if IPMI_IP_ADDRESS is 0.0.0.0, wait 60 seconds and retry.
-        set_ipmi_network_source("Static")
-        time.sleep(2)
-        set_ipmi_network_source("Use_DHCP")
-        time.sleep(60)
-        IPMI_IP_ADDRESS = get_ipmi_ip_address()
-
-    if IPMI_IP_ADDRESS is None or IPMI_IP_ADDRESS == "0.0.0.0":
-        # Exit (to not set power params in MAAS) if no IPMI_IP_ADDRESS
-        # has been detected
-        exit(1)
-
-    print get_maas_power_settings(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD, IPMI_IP_ADDRESS)
-
-if __name__ == '__main__':
-    main()
+{{maas_ipmi_autodetect_py}}
 END_MAAS_IPMI_AUTODETECT
 
 add_bin "maas_api_helper.py" <<"END_MAAS_API_HELPER"

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2013-05-11 18:38:34 +0000
+++ src/maasserver/preseed.py	2013-06-12 17:17:25 +0000
@@ -35,6 +35,8 @@
 from maasserver.utils import absolute_reverse
 import tempita
 
+from metadataserver.commissioning.snippets import get_snippet_context
+
 
 GENERIC_FILENAME = 'generic'
 
@@ -287,7 +289,10 @@
     """
     template = load_preseed_template(None, prefix, release)
     context = get_preseed_context(release, nodegroup=nodegroup)
-    return template.substitute(**context)
+    # Render the snippets in the main template.
+    snippets = get_snippet_context()
+    snippets.update(context)
+    return template.substitute(**snippets)
 
 
 def render_preseed(node, prefix, release=''):

=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2013-05-11 18:38:34 +0000
+++ src/maasserver/tests/test_preseed.py	2013-06-12 17:17:25 +0000
@@ -421,10 +421,12 @@
     missing).
     """
 
-    # Create a scenario for each possible value of PRESEED_TYPE.
+    # Create a scenario for each possible value of PRESEED_TYPE except
+    # enlistment. Those have their own test case.
     scenarios = [
         (name, {'preseed': value})
-        for name, value in map_enum(PRESEED_TYPE).items()]
+        for name, value in map_enum(PRESEED_TYPE).items()
+            if not value.startswith('enlist')]
 
     def test_render_preseed(self):
         node = factory.make_node()
@@ -448,8 +450,15 @@
 class TestRenderEnlistmentPreseed(TestCase):
     """Tests for `render_enlistment_preseed`."""
 
+    # Create a scenario for each possible value of PRESEED_TYPE for
+    # enlistment. The rest have their own test case.
+    scenarios = [
+        (name, {'preseed': value})
+        for name, value in map_enum(PRESEED_TYPE).items()
+            if value.startswith('enlist')]
+
     def test_render_enlistment_preseed(self):
-        preseed = render_enlistment_preseed(PRESEED_TYPE.ENLIST, "precise")
+        preseed = render_enlistment_preseed(self.preseed, "precise")
         # The test really is that the preseed is rendered without an
         # error.
         self.assertIsInstance(preseed, str)
@@ -460,7 +469,7 @@
         self.patch(settings, 'DEFAULT_MAAS_URL', maas_url)
         nodegroup = factory.make_node_group(maas_url=ng_url)
         preseed = render_enlistment_preseed(
-            PRESEED_TYPE.ENLIST, "precise", nodegroup=nodegroup)
+            self.preseed, "precise", nodegroup=nodegroup)
         self.assertThat(
             preseed, MatchesAll(*[Contains(ng_url), Not(Contains(maas_url))]))
 

=== modified file 'src/metadataserver/commissioning/snippets.py'
--- src/metadataserver/commissioning/snippets.py	2013-06-04 12:22:16 +0000
+++ src/metadataserver/commissioning/snippets.py	2013-06-12 17:17:25 +0000
@@ -18,9 +18,31 @@
     'list_snippets',
     'read_snippet',
     'strip_name',
+    'get_snippet_context',
+    'get_userdata_template_dir',
     ]
 
 import os
+from provisioningserver.utils import locate_config
+
+USERDATA_BASE_DIR = 'templates/commissioning-user-data'
+
+
+def get_userdata_template_dir():
+    """Return the absolute location of the userdata
+    template directory."""
+    return locate_config(USERDATA_BASE_DIR)
+
+
+def get_snippet_context(snippets_dir=None, encoding='utf-8'):
+    """Return the context of all of the snippets."""
+    if snippets_dir is None:
+        snippets_dir = os.path.join(get_userdata_template_dir(), 'snippets')
+    snippets = {
+        strip_name(name): read_snippet(snippets_dir, name, encoding=encoding)
+        for name in list_snippets(snippets_dir)
+        }
+    return snippets
 
 
 def read_snippet(snippets_dir, name, encoding='utf-8'):

=== modified file 'src/metadataserver/commissioning/tests/test_snippets.py'
--- src/metadataserver/commissioning/tests/test_snippets.py	2013-06-04 12:22:16 +0000
+++ src/metadataserver/commissioning/tests/test_snippets.py	2013-06-12 17:17:25 +0000
@@ -21,6 +21,7 @@
     list_snippets,
     read_snippet,
     strip_name,
+    get_snippet_context,
     )
 
 
@@ -59,3 +60,14 @@
         factory.make_file(snippets_dir, 'snippet')
         factory.make_file(snippets_dir, '.backup.pyc')
         self.assertItemsEqual(['snippet'], list_snippets(snippets_dir))
+
+    def test_get_snippet_context(self):
+        contents = factory.getRandomString()
+        snippets_dir = self.make_dir()
+        factory.make_file(snippets_dir, 'snippet.py', contents=contents)
+        self.assertItemsEqual({'snippet_py': contents}, get_snippet_context(snippets_dir=snippets_dir))
+
+    def test_get_snippet_context_empty_if_no_snippets(self):
+        snippets_dir = self.make_dir()
+        context = {}
+        self.assertEqual(context, get_snippet_context(snippets_dir=snippets_dir))

=== modified file 'src/metadataserver/commissioning/tests/test_user_data.py'
--- src/metadataserver/commissioning/tests/test_user_data.py	2013-06-04 12:22:16 +0000
+++ src/metadataserver/commissioning/tests/test_user_data.py	2013-06-12 17:17:25 +0000
@@ -32,6 +32,7 @@
             generate_user_data(), ContainsAll({
                 'maas-get',
                 'maas-signal',
+                'maas-ipmi-autodetect',
                 'def authenticate_headers',
                 'def encode_multipart_data',
             }))

=== modified file 'src/metadataserver/commissioning/user_data.py'
--- src/metadataserver/commissioning/user_data.py	2013-06-04 14:45:01 +0000
+++ src/metadataserver/commissioning/user_data.py	2013-06-12 17:17:25 +0000
@@ -30,10 +30,13 @@
     list_snippets,
     read_snippet,
     strip_name,
+    get_userdata_template_dir,
+    get_snippet_context,
     )
-from provisioningserver.utils import locate_config
 import tempita
 
+ENCODING = 'utf-8'
+
 
 def generate_user_data(nodegroup=None):
     """Produce the main commissioning script.
@@ -50,13 +53,11 @@
 
     :rtype: `bytes`
     """
-    ENCODING = 'utf-8'
-    commissioning_dir = locate_config('templates/commissioning-user-data')
+    commissioning_dir = get_userdata_template_dir()
     userdata_template_file = os.path.join(
         commissioning_dir, 'user_data.template')
     config_template_file = os.path.join(
         commissioning_dir, 'user_data_config.template')
-    snippets_dir = os.path.join(commissioning_dir, 'snippets')
     userdata_template = tempita.Template.from_filename(
         userdata_template_file, encoding=ENCODING)
     config_template = tempita.Template.from_filename(
@@ -66,10 +67,7 @@
     preseed_context = get_preseed_context(nodegroup=nodegroup)
 
     # Render the snippets in the main template.
-    snippets = {
-        strip_name(name): read_snippet(snippets_dir, name, encoding=ENCODING)
-        for name in list_snippets(snippets_dir)
-    }
+    snippets = get_snippet_context(encoding=ENCODING)
     snippets.update(preseed_context)
     userdata = userdata_template.substitute(snippets).encode(ENCODING)