Merge lp:~rvb/maas-test/bmc-params-4 into lp:maas-test

[Raphaël Badin]

Add params to pass BMC information.

Still no testing for the parsing code because we're still unsure if this is going to stay exactly like that. Note that I finally the two existing test cases into one since they are really close; as a result, the code is a bit simpler.

[lp:~rvb/maas-test/bmc-params-4]

52. By Raphaël Badin on 2013-11-21

Merged bmc-params-3 into bmc-params-4.

[Graham Binns (gmb)]

review: Approve

[lp:~rvb/maas-test/bmc-params-4]

53. By Raphaël Badin on 2013-11-21

Merged bmc-params-3 into bmc-params-4.

=== modified file 'maastest/main.py'
--- maastest/main.py	2013-11-20 10:30:06 +0000
+++ maastest/main.py	2013-11-21 14:40:46 +0000
@@ -31,11 +31,9 @@
 
 class TestMAAS(testtools.TestCase, testresources.ResourcedTestCase):
 
-    direct_interface = None
-
     @classmethod
-    def configure(cls, interface):
-        cls.direct_interface = interface
+    def configure(cls, args):
+        cls.args = args
 
     @classmethod
     def setUpClass(cls):
@@ -44,7 +42,7 @@
         architecture = utils.determine_vm_architecture()
         cls.machine = KVMFixture(
             series='saucy', architecture=architecture,
-            direct_interface=cls.direct_interface)
+            direct_interface=cls.args.interface)
         cls.machine.setUp()
         try:
             cls.maas = MAASFixture(cls.machine)
@@ -108,21 +106,55 @@
         return relevant_nodes
 
 
-class TestInteractiveOneNode(TestMAAS):
-    """Test if a node is compatible with MAAS.
-
-    This is an interactive test: after MAAS is set up inside a virtual
-    machine, it waits for the user to power up the node under test before
-    trying to enlist and commission it."""
-
-    def test_enlist_node(self):
-        """Enlist node."""
+class TestOneNode(TestMAAS):
+    """Test if a node is compatible with MAAS."""
+
+    def test_power_up_node(self):
+        """Power up the node under test.
+
+        If maas-test is running in interactive mode, this will ask the user
+        to power up the node manually.  Otherwise it will use the provided
+        power parameters to power up the node by running 'ipmipower' in the
+        virtual machine..
+        """
         # TODO: only print this in debug/verbose mode.
         self.print_connection_details()
+        if self.args.interactive_enlistment:
+            self.power_up_node_interactive()
+        else:
+            self.power_up_node_noninteractive()
+
+    def power_up_node_interactive(self):
+        """Asks the user to power up the node manually."""
         print(
             "Power up the node under test and press enter to proceed "
             "with the testing.")
         sys.stdin.readline()
+
+    def power_up_node_noninteractive(self):
+        """Power up the node using the provided power parameters."""
+        # Scan the network to find the IP address of the node's BMC.
+        for retry in utils.retries(delay=20, timeout=5 * 60):
+            ip_scan = self.maas.kvm_fixture.get_ip_from_network_scan
+            power_address = ip_scan(self.args.bmc_mac)
+            if power_address is not None:
+                break
+        if power_address is None:
+            self.fail("Failed to get the IP address of the BMC.")
+        # Power-cycle the node.
+        self.maas.kvm_fixture.run_command([
+            'ipmipower', '-h', power_address,
+            '-u', self.args.bmc_username,
+            '-p', self.args.bmc_password, '--off'],
+            check_call=True)
+        self.maas.kvm_fixture.run_command([
+            'ipmipower', '-h', power_address,
+            '-u', self.args.bmc_username,
+            '-p', self.args.bmc_password, '--on'],
+            check_call=True)
+
+    def test_enlist_node(self):
+        """Enlist node."""
         for retry in utils.retries(delay=10, timeout=10 * 60):
             nb_enlisted_nodes = len(self.get_node_list(0))  # 0 = 'Declared'.
             if nb_enlisted_nodes == 1:
@@ -134,7 +166,8 @@
         uri = utils.get_uri('nodes/')
         response = self.maas.admin_maas_client.post(uri, op="accept_all")
         self.assertEqual(
-            httplib.OK, response.code, "Failed to get accept the node.")
+            httplib.OK, response.code, "Failed to accept node.")
+
         for retry in utils.retries(delay=10, timeout=10 * 60):
             nb_enlisted_nodes = len(self.get_node_list(4))  # 4 = 'Ready'.
             if nb_enlisted_nodes == 1:
@@ -142,17 +175,6 @@
         self.fail("Failed to commission node.")
 
 
-class TestOneNode(TestMAAS):
-    """Test if a node is compatible with MAAS.
-
-    This is a non-interactive test: after MAAS is set up inside a virtual
-    machine, it will enlist the node with the power parameters provided and
-    commission it."""
-
-    def test_to_do(self):
-        raise NotImplementedError("TODO!")
-
-
 def check_kvm_ok():
     """Check that this machine is capable of running KVM.
 
@@ -179,17 +201,7 @@
         logging.error("Unable to continue without KVM extensions.")
         return 1
 
-    if args.interactive_enlistment:
-        base_class = TestInteractiveOneNode
-    else:
-        # Blow up right now to avoid creating the VM before blowing up in
-        # TestOneNode.test_to_do.
-        raise NotImplementedError(
-            "Non-interactive mode not yet implemented, use "
-            "--interactive-enlistment for now")
-        base_class = TestOneNode
-
-    class ConfiguredTestMAAS(base_class):
+    class ConfiguredTestMAAS(TestOneNode):
         """A configured version of TestInteractiveOneNode.
 
         ConfiguredTestMAAS is a TestMAAS use to configure it by calling
@@ -197,7 +209,7 @@
         the instance because the KVMFixture TestMAAS instanciates and needs
         to configure is created at the class level.
         """
-    ConfiguredTestMAAS.configure(args.interface)
+    ConfiguredTestMAAS.configure(args)
 
     # Create a TestLoader which loads the tests in the order in which
     # they are defined in the test case class.
 
=== modified file 'maastest/parser.py'
--- maastest/parser.py	2013-11-20 11:53:52 +0000
+++ maastest/parser.py	2013-11-21 14:40:46 +0000
@@ -19,11 +19,29 @@
 from six import text_type
 
 
+class MAASTestArgumentParser(argparse.ArgumentParser):
+
+    def parse_args(self):
+        args = super(MAASTestArgumentParser, self).parse_args()
+        bmc_details = (args.bmc_mac, args.bmc_username, args.bmc_password)
+        if args.interactive_enlistment:
+            if bmc_details != (None, None, None):
+                self.error(
+                    "None of the BMC details should be provided when using "
+                    "--interactive-enlistment.")
+        else:
+            if None in bmc_details:
+                self.error(
+                    "All the BMC details (MAC address, username "
+                    "and password) must be provided.")
+        return args
+
+
 def prepare_parser():
     # TODO: This is not tested sinc how maas-test will interface with
     # checkbox is still in flux.  Right now, this is just to get the
     # testing going.
-    parser = argparse.ArgumentParser(
+    parser = MAASTestArgumentParser(
         description="Test whether or not a node is compatible with MAAS.")
 
     parser.add_argument(
@@ -39,8 +57,21 @@
              "e.g. ppa:maas-maintainers/dailybuilds).")
     parser.add_argument(
         '--interactive-enlistment', action='store_true',
-        help="Perform an interactive enlistment.  Instead of passing the "
-             "IPMI details on the command line, ask for the node to be "
-             "powered up manually and enlist the node when it PXE boots.")
+        help="Perform an interactive enlistment. Instead of passing the "
+             "BMC details on the command line, the node will have to be "
+             "powered up manually.")
+    # BMC details.
+    parser.add_argument(
+        '--bmc-mac', type=text_type,
+        help="The MAC address of the node's BMC. This will be used to "
+             "power up the node to enlist it.")
+    parser.add_argument(
+        '--bmc-username', type=text_type,
+        help="The username to use when authenticating with the node's BMC. "
+             "This will be used to power up the node to enlist it.")
+    parser.add_argument(
+        '--bmc-password', type=text_type,
+        help="The password to use when authenticating with the node's BMC. "
+             "This will be used to power up the node to enlist it.")
 
     return parser