Merge lp:~pwlars/lava-dispatcher/add-uboot-support into lp:lava-dispatcher

[Paul Larson]

This adds support for booting to test images, and other necessary
pieces for that, such as detecting and dealing with uboot.

[Zygmunt Krynicki (zyga)]

Just two comments. I don't think we should default to beagle in the initializer. It makes it possible to omit this argument (or worse, develop on beagle all the time) and produce buggy code by accident. I would also create constants for names like beagle to make sure a simple typo will not be something hard to chase and debug. Right now it's not needed but I suspect this wil come back.

Thanks Paul
ZK

[Paul Larson (pwlars)]

> Just two comments. I don't think we should default to beagle in the
> initializer. It makes it possible to omit this argument (or worse, develop on
> beagle all the time) and produce buggy code by accident.
Yeah, for some things it's a reasonable default since we have a wide variety of boards that correspond to this hwpack. In this case though, it could be a bad assumption. I'll make it explicit.

> I would also create
> constants for names like beagle to make sure a simple typo will not be
> something hard to chase and debug. Right now it's not needed but I suspect
> this wil come back.
I'm not sure if I see how this would help. If I understand what you're getting at, in either case the failure would be pretty much the same - trying to reference an entry in the dict that does not exist, and getting nothing back to send to uboot?

Will check this in for now, and we can deal with that later if needed.

[lp:~pwlars/lava-dispatcher/add-uboot-support]

4. By Paul Larson on 2011-01-26

Make board type mandatory.

=== modified file 'lava/client.py'
--- lava/client.py	2011-01-21 22:46:55 +0000
+++ lava/client.py	2011-01-26 19:48:26 +0000
@@ -1,9 +1,30 @@
 import pexpect
 
+BOARDS = {
+    "beagle":["mmc init",
+        "setenv bootcmd 'fatload mmc 0:3 0x80000000 uImage; fatload mmc" \
+        "0:3 0x81600000 uInitrd; bootm 0x80000000 0x81600000'",
+        "setenv bootargs ' console=tty0 console=ttyO2,115200n8 " \
+        "root=LABEL=testrootfs rootwait ro earlyprintk fixrtc nocompcache " \
+        "vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60'",
+        "boot"],
+    "panda":["mmc init",
+        "setenv bootcmd 'fatload mmc 0:1 0x80200000 uImage; fatload mmc " \
+        "0:1 0x81600000 uInitrd; bootm 0x80200000 0x81600000'",
+        "setenv bootargs ' console=tty0 console=ttyO2,115200n8 " \
+        "root=LABEL=testrootfs rootwait ro earlyprintk fixrtc nocompcache " \
+        "vram=32M omapfb.vram=0:8M mem=463M ip=none'",
+        "boot"]
+}
+
 class SerialClient:
-    def __init__(self, hostname):
+    def __init__(self, hostname, board_type):
         cmd = "console %s" % hostname
         self.proc = pexpect.spawn(cmd, timeout=300)
+        #serial can be slow, races do funny things if ou don't increase delay
+        self.proc.delaybeforesend=1
+        #This is temporary, eventually I think this should be looked up
+        self.board_type = board_type
 
     def in_master_shell(self):
         """ Check that we are in a shell on the master image
@@ -13,6 +34,14 @@
         if id == 1:
             raise OperationFailed
 
+    def in_test_shell(self):
+        """ Check that we are in a shell on the test image
+        """
+        self.proc.sendline("")
+        id = self.proc.expect(['root@localhost:', pexpect.TIMEOUT])
+        if id == 1:
+            raise OperationFailed
+
     def boot_master_image(self):
         """ reboot the system, and check that we are in a master shell
         """
@@ -26,6 +55,29 @@
             except:
                 raise
 
+    def boot_test_image(self):
+        """ Reboot the system to the test image
+        """
+        self.soft_reboot()
+        try:
+            self.enter_uboot()
+        except:
+            self.hard_reboot()
+            self.enter_uboot()
+        uboot_cmds = BOARDS[self.board_type]
+        self.proc.sendline(uboot_cmds[0])
+        for line in range(1, len(uboot_cmds)):
+            self.proc.expect("#")
+            self.proc.sendline(uboot_cmds[line])
+        try:
+            self.in_test_shell()
+        except:
+            raise
+
+    def enter_uboot(self):
+        id = self.proc.expect("Hit any key to stop autoboot")
+        self.proc.sendline("")
+
     def soft_reboot(self):
         self.proc.sendline("reboot")