[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 613: Updates for new Highbank firmware

Message ID 20130529184815.17387.79051.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Tyler Baker May 29, 2013, 6:48 p.m.
Merge authors:
  Tyler Baker (tyler-baker)
Related merge proposals:
  https://code.launchpad.net/~tyler-baker/lava-dispatcher/highbank-updates/+merge/166349
  proposed by: Tyler Baker (tyler-baker)
  review: Approve - Antonio Terceiro (terceiro)
------------------------------------------------------------
revno: 613 [merge]
committer: Tyler Baker <tyler.baker@linaro.org>
branch nick: lava-dispatcher-trunk
timestamp: Wed 2013-05-29 11:47:20 -0700
message:
  Updates for new Highbank firmware
modified:
  lava_dispatcher/device/highbank.py
  lava_dispatcher/ipmi.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription

Patch

=== modified file 'lava_dispatcher/device/highbank.py'
--- lava_dispatcher/device/highbank.py	2013-05-15 18:17:02 +0000
+++ lava_dispatcher/device/highbank.py	2013-05-29 18:36:04 +0000
@@ -232,21 +232,14 @@ 
     @contextlib.contextmanager
     def _as_master(self):
         self.bootcontrol.power_on_boot_master()
-
-        # Two reboots seem to be necessary to ensure that pxe boot is used.
-        # Need to identify the cause and fix it
-        self.proc.expect("Hit any key to stop autoboot:")
-        self.proc.sendline('')
-        self.bootcontrol.power_reset_boot_master()
-
         self.proc.expect("\(initramfs\)")
         self.proc.sendline('export PS1="%s"' % self.MASTER_PS1)
         self.proc.expect(self.MASTER_PS1_PATTERN, timeout=180, lava_no_logging=1)
         runner = HBMasterCommandRunner(self)
 
         runner.run(". /scripts/functions")
-        device = "eth0"
-        runner.run("DEVICE=%s configure_networking" % device)
+        runner.run("DEVICE=%s configure_networking" % 
+                   self.config.default_network_interface)
 
         # we call dhclient even though configure_networking above already
         # picked up a IP address. configure_networking brings the interface up,

=== modified file 'lava_dispatcher/ipmi.py'
--- lava_dispatcher/ipmi.py	2013-05-16 12:43:27 +0000
+++ lava_dispatcher/ipmi.py	2013-05-29 18:09:54 +0000
@@ -56,7 +56,6 @@ 
     def reset(self):
         self.__ipmi("chassis power reset")
 
-
 class IpmiPxeBoot(object):
     """
     This class provides a convenient object-oriented API that can be
@@ -70,16 +69,10 @@ 
     def power_on_boot_master(self):
         self.ipmitool.set_to_boot_from_pxe()
         self.ipmitool.power_on()
-        self.ipmitool.reset()
-
-    def power_reset_boot_master(self):
-        self.ipmitool.set_to_boot_from_pxe()
-        self.ipmitool.reset()
 
     def power_on_boot_image(self):
         self.ipmitool.set_to_boot_from_disk()
         self.ipmitool.power_on()
-        self.ipmitool.reset()
 
     def power_off(self):
         self.ipmitool.power_off()