Merge ~andreserl/maas:add_skip_bmc_config into maas:master

[Andres Rodriguez]

Add ability to skip BMC configuration over the API only

[Lee Trager (ltrager)]

LGTM!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b add_skip_bmc_config lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2099/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add_skip_bmc_config lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2104/console
COMMIT: 1e7643cb76530247eeff6de8b74c2aa176d06044

review: Needs Fixing

[MAAS Lander (maas-lander)]

LANDING
-b add_skip_bmc_config lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2113/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add_skip_bmc_config lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e394a632d242396faeaf21abc7eb52b1e7911a3d

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b add_skip_bmc_config lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2134/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add_skip_bmc_config lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: d5e120c5879eccede0d22044bc7ec4402d42ee18

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b add_skip_bmc_config lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2144/consoleText

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index 06219c8..cfc5d0d 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -676,6 +676,9 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
         :param enable_ssh: Whether to enable SSH for the commissioning
             environment using the user's SSH key(s).
         :type enable_ssh: bool ('0' for False, '1' for True)
+        :param skip_bmc_config: Whether to skip re-configuration of the BMC
+            for IPMI based machines.
+        :type skip_bmc_config: bool ('0' for False, '1' for True)
         :param skip_networking: Whether to skip re-configuring the networking
             on the machine after the commissioning has completed.
         :type skip_networking: bool ('0' for False, '1' for True)
diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py
index 34d5d5d..65fd929 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -1039,6 +1039,7 @@ class TestMachineAPI(APITestCase.ForUser):
         response = self.client.post(self.get_machine_uri(machine), {
             'op': 'commission',
             'enable_ssh': "true",
+            'skip_bmc_config': 1,
             'skip_networking': 1,
             'commissioning_scripts': ','.join([
                 choice([
@@ -1056,6 +1057,7 @@ class TestMachineAPI(APITestCase.ForUser):
         commissioning_script_set = machine.current_commissioning_script_set
         testing_script_set = machine.current_testing_script_set
         self.assertTrue(machine.enable_ssh)
+        self.assertTrue(machine.skip_bmc_config)
         self.assertTrue(machine.skip_networking)
         self.assertItemsEqual(
             set(expected_commissioning_scripts),
diff --git a/src/maasserver/forms/ephemeral.py b/src/maasserver/forms/ephemeral.py
index 46a873b..7e1ea01 100644
--- a/src/maasserver/forms/ephemeral.py
+++ b/src/maasserver/forms/ephemeral.py
@@ -92,6 +92,7 @@ class TestForm(Form):
 class CommissionForm(TestForm):
     """Commission form."""
 
+    skip_bmc_config = BooleanField(required=False, initial=False)
     skip_networking = BooleanField(required=False, initial=False)
     skip_storage = BooleanField(required=False, initial=False)
 
@@ -131,11 +132,12 @@ class CommissionForm(TestForm):
 
     def save(self):
         enable_ssh = self.cleaned_data.get("enable_ssh", False)
+        skip_bmc_config = self.cleaned_data.get("skip_bmc_config", False)
         skip_networking = self.cleaned_data.get("skip_networking", False)
         skip_storage = self.cleaned_data.get("skip_storage", False)
         commissioning_scripts = self.cleaned_data.get("commissioning_scripts")
         testing_scripts = self.cleaned_data.get("testing_scripts")
         self.instance.start_commissioning(
-            self.user, enable_ssh, skip_networking, skip_storage,
-            commissioning_scripts, testing_scripts)
+            self.user, enable_ssh, skip_bmc_config, skip_networking,
+            skip_storage, commissioning_scripts, testing_scripts)
         return self.instance
diff --git a/src/maasserver/forms/tests/test_ephemeral.py b/src/maasserver/forms/tests/test_ephemeral.py
index 3b457a7..3cd3dea 100644
--- a/src/maasserver/forms/tests/test_ephemeral.py
+++ b/src/maasserver/forms/tests/test_ephemeral.py
@@ -146,9 +146,9 @@ class TestCommissionForm(MAASServerTestCase):
         self.assertThat(
             mock_start_commissioning,
             MockCalledOnceWith(
-                user, enable_ssh=False, skip_networking=False,
-                skip_storage=False, commissioning_scripts=[],
-                testing_scripts=[]))
+                user, enable_ssh=False, skip_bmc_config=False,
+                skip_networking=False, skip_storage=False,
+                commissioning_scripts=[], testing_scripts=[]))
 
     def test__calls_start_commissioning_with_options(self):
         node = factory.make_Node(
@@ -166,6 +166,7 @@ class TestCommissionForm(MAASServerTestCase):
             node, 'start_commissioning')
         form = CommissionForm(instance=node, user=user, data={
             'enable_ssh': True,
+            'skip_bmc_config': True,
             'skip_networking': True,
             'skip_storage': True,
             'commissioning_scripts': ','.join(commissioning_scripts),
@@ -177,7 +178,8 @@ class TestCommissionForm(MAASServerTestCase):
         self.assertThat(
             mock_start_commissioning,
             MockCalledOnceWith(
-                user, enable_ssh=True, skip_networking=True, skip_storage=True,
+                user, enable_ssh=True, skip_bmc_config=True,
+                skip_networking=True, skip_storage=True,
                 commissioning_scripts=commissioning_scripts,
                 testing_scripts=testing_scripts))
 
@@ -214,6 +216,6 @@ class TestCommissionForm(MAASServerTestCase):
         self.assertThat(
             mock_start_commissioning,
             MockCalledOnceWith(
-                user, enable_ssh=False, skip_networking=False,
-                skip_storage=False, commissioning_scripts=[],
-                testing_scripts=['none']))
+                user, enable_ssh=False, skip_bmc_config=False,
+                skip_networking=False, skip_storage=False,
+                commissioning_scripts=[], testing_scripts=['none']))
diff --git a/src/maasserver/migrations/builtin/maasserver/0153_add_skip_bmc_config.py b/src/maasserver/migrations/builtin/maasserver/0153_add_skip_bmc_config.py
new file mode 100644
index 0000000..fc9ad72
--- /dev/null
+++ b/src/maasserver/migrations/builtin/maasserver/0153_add_skip_bmc_config.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-03-27 16:59
+from __future__ import unicode_literals
+
+from django.db import (
+    migrations,
+    models,
+)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0152_add_usergroup_local'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='node',
+            name='skip_bmc_config',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index a6d49ce..c8821e8 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -857,6 +857,8 @@ class Node(CleanSave, TimestampedModel):
     :ivar enable_ssh: An optional flag to indicate if this node can have
         ssh enabled during commissioning, allowing the user to ssh into the
         machine's commissioning environment using the user's SSH key.
+    :ivar skip_bmc_config: An optional flag to indicate if this node can be
+        commissioned without re-running the IPMI auto discovery mechanism.
     :ivar skip_networking: An optional flag to indicate if this node
         networking configuration doesn't need to be touched when it is
         commissioned.
@@ -1039,6 +1041,7 @@ class Node(CleanSave, TimestampedModel):
     #  2. Skip reconfiguring networking when a node is commissioned.
     #  3. Skip reconfiguring storage when a node is commissioned.
     enable_ssh = BooleanField(default=False)
+    skip_bmc_config = BooleanField(default=False)
     skip_networking = BooleanField(default=False)
     skip_storage = BooleanField(default=False)
 
@@ -1854,9 +1857,9 @@ class Node(CleanSave, TimestampedModel):
 
     @transactional
     def start_commissioning(
-            self, user, enable_ssh=False, skip_networking=False,
-            skip_storage=False, commissioning_scripts=[],
-            testing_scripts=[]):
+            self, user, enable_ssh=False, skip_bmc_config=False,
+            skip_networking=False, skip_storage=False,
+            commissioning_scripts=[], testing_scripts=[]):
         """Install OS and self-test a new node.
 
         :return: a `Deferred` which contains the post-commit tasks that are
@@ -1879,6 +1882,7 @@ class Node(CleanSave, TimestampedModel):
 
         # Set the commissioning options on the node.
         self.enable_ssh = enable_ssh
+        self.skip_bmc_config = skip_bmc_config
         self.skip_networking = skip_networking
         self.skip_storage = skip_storage
 
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index bb23d00..5ce5244 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -2685,6 +2685,7 @@ class TestNode(MAASServerTestCase):
                 post_commit()))
         admin = factory.make_admin()
         enable_ssh = factory.pick_bool()
+        skip_bmc_config = factory.pick_bool()
         skip_networking = factory.pick_bool()
         skip_storage = factory.pick_bool()
         node.start_commissioning(
@@ -2694,6 +2695,7 @@ class TestNode(MAASServerTestCase):
         node = reload_object(node)
         expected_attrs = {
             'enable_ssh': enable_ssh,
+            'skip_bmc_config': skip_bmc_config,
             'skip_networking': skip_networking,
             'skip_storage': skip_storage,
         }
diff --git a/src/maasserver/node_action.py b/src/maasserver/node_action.py
index 45c13a2..72b56c3 100644
--- a/src/maasserver/node_action.py
+++ b/src/maasserver/node_action.py
@@ -233,14 +233,15 @@ class Commission(NodeAction):
     for_type = {NODE_TYPE.MACHINE}
 
     def execute(
-            self, enable_ssh=False, skip_networking=False,
-            skip_storage=False, commissioning_scripts=[],
-            testing_scripts=[]):
+            self, enable_ssh=False, skip_bmc_config=False,
+            skip_networking=False, skip_storage=False,
+            commissioning_scripts=[], testing_scripts=[]):
         """See `NodeAction.execute`."""
         try:
             self.node.start_commissioning(
                 self.user,
                 enable_ssh=enable_ssh,
+                skip_bmc_config=skip_bmc_config,
                 skip_networking=skip_networking,
                 skip_storage=skip_storage,
                 commissioning_scripts=commissioning_scripts,
diff --git a/src/maasserver/websockets/handlers/controller.py b/src/maasserver/websockets/handlers/controller.py
index f207da5..9fbe5c8 100644
--- a/src/maasserver/websockets/handlers/controller.py
+++ b/src/maasserver/websockets/handlers/controller.py
@@ -60,6 +60,7 @@ class ControllerHandler(MachineHandler):
             "gateway_link_ipv4",
             "gateway_link_ipv6",
             "enable_ssh",
+            "skip_bmc_config",
             "skip_networking",
             "skip_storage",
             "instance_power_parameters",
diff --git a/src/maasserver/websockets/handlers/device.py b/src/maasserver/websockets/handlers/device.py
index 7469821..dc5374f 100644
--- a/src/maasserver/websockets/handlers/device.py
+++ b/src/maasserver/websockets/handlers/device.py
@@ -113,6 +113,7 @@ class DeviceHandler(NodeHandler):
             "gateway_link_ipv4",
             "gateway_link_ipv6",
             "enable_ssh",
+            "skip_bmc_config",
             "skip_networking",
             "skip_storage",
             "instance_power_parameters",
diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index b1c0e20..375b0fb 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -149,6 +149,7 @@ class MachineHandler(NodeHandler):
             "gateway_link_ipv4",
             "gateway_link_ipv6",
             "enable_ssh",
+            "skip_bmc_config",
             "skip_networking",
             "skip_storage",
             "instance_power_parameters",
diff --git a/src/metadataserver/user_data/templates/commissioning.template b/src/metadataserver/user_data/templates/commissioning.template
index bea840f..1ba2510 100644
--- a/src/metadataserver/user_data/templates/commissioning.template
+++ b/src/metadataserver/user_data/templates/commissioning.template
@@ -26,7 +26,7 @@ add_ipmi_config() {
 
 main() {
     prep_maas_api_helper
-
+    {{if not node.skip_bmc_config}}
     # LP:1730524 - Make sure we can signal the metadata service before updating
     # the BMC username and password.
     signal WORKING "Starting [maas-bmc-autodetect]" || exit 1
@@ -67,6 +67,7 @@ main() {
           "--power-type=${power_type}" "--power-parameters=${power_settings}" \
           WORKING "Finished [maas-bmc-autodetect]"
     fi
+    {{endif}}
 
     maas-run-remote-scripts "--config=${CRED_CFG}" "${TEMP_D}"
 }
@@ -101,6 +102,5 @@ add_bin "maas-run-remote-scripts" <<"END_MAAS_RUN_REMOTE_SCRIPTS"
 {{maas_run_remote_scripts_py}}
 END_MAAS_RUN_REMOTE_SCRIPTS
 
-
 main
 exit