Merge lp:~rvb/maas-test/install-cluster-first into lp:maas-test

[Raphaël Badin]

Configure the cluster before importing the images. Some of the power types rely on the arp cache being populated so that maas-test finds the IP address of the BMC; Configuring the DHCP server early (i.e. before importing the images which takes a lot of time) will help with that since the BMC will be able to get an IP address using DHCP more quickly.

[lp:~rvb/maas-test/install-cluster-first]

156. By Raphaël Badin on 2014-04-28

Add logging.

[Graham Binns (gmb)]

review: Approve

=== modified file 'maastest/maasfixture.py'
--- maastest/maasfixture.py	2014-04-25 15:46:59 +0000
+++ maastest/maasfixture.py	2014-04-28 11:23:55 +0000
@@ -362,17 +362,17 @@
         self.addCleanup(self.collect_logs)
         self.addCleanup(self.dump_data)
 
-        # Now do the rest of the setup: import images, configure the
-        # controllers, and so on.
+        # Now do the rest of the setup: configure the
+        # controllers, import images, and so on.
+        if self.kvm_fixture.direct_ip is not None:
+            self.check_cluster_connected()
+            self.configure_cluster()
         self.import_maas_images(
             series=self.series, architecture=self.architecture,
             simplestreams_filter=self.simplestreams_filter,
             image_stream_url=self.image_stream_url)
         self.wait_until_boot_images_scanned()
         self.configure_default_series(self.series)
-        if self.kvm_fixture.direct_ip is not None:
-            self.check_cluster_connected()
-            self.configure_cluster()
 
     def log_connection_details(self):
         """Log the details on how to connect to this MAAS server."""
@@ -433,6 +433,7 @@
         raise Exception("Master cluster failed to connect.")
 
     def configure_cluster(self):
+        logging.info("Configuring cluster...")
         network = self.kvm_fixture.direct_network
         first_ip = self.kvm_fixture.direct_first_available_ip()
         last_ip = "%s" % netaddr.IPAddress(
@@ -460,3 +461,4 @@
 
         if response.code != httplib.OK:
             raise Exception("Error configure the master cluster")
+        logging.info("Done configuring cluster.")