Merge lp:~lool/lava-dispatcher/config into lp:~qzhang/lava-dispatcher/remove-hardcode

[Loïc Minier]

Fixes the issues I raised in my review, and implements proposed changes

[Spring Zhang (qzhang)]

Thanks, I will merge it.

review: Approve

[Michael Hudson-Doyle (mwhudson)]

I think this got into trunk somehow or other.

Unmerged revisions

30. By Loïc Minier on 2011-03-11

Drop VexpressBoard as the data isn't confirmed for now.

29. By Loïc Minier on 2011-03-11

No need to instantiate boards anymore.

28. By Loïc Minier on 2011-03-11

Rename Boards to BOARDS to make it clear it's static.

27. By Loïc Minier on 2011-03-11

Drop Board.name, and let the client remember the hostname instead; this
avoids duplicating the data in Boards and in each Board.

26. By Loïc Minier on 2011-03-11

Also rename target to board here.

25. By Loïc Minier on 2011-03-11

Make uboot_cmds a class property instead of setting them in __init__.

24. By Loïc Minier on 2011-03-11

Fix testsuite to pass with the config in the trunk branch.

23. By Loïc Minier on 2011-03-11

Remove useless imports.

22. By Loïc Minier on 2011-03-11

Fix typo in imports breaking the tests.

21. By Loïc Minier on 2011-03-11

Drop unused function.

=== modified file 'lava/actions/deploy.py'
--- lava/actions/deploy.py	2011-03-07 17:58:46 +0000
+++ lava/actions/deploy.py	2011-03-11 00:48:58 +0000
@@ -3,7 +3,7 @@
 
 class cmd_deploy_linaro_image(BaseAction):
     def run(self, hwpack, rootfs):
-        print "deploying on %s" % self.client.target.name
+        print "deploying on %s" % self.client.hostname
         print "  hwpack: %s" % hwpack
         print "  rootfs: %s" % rootfs
         print "Booting master image"

=== modified file 'lava/client.py'
--- lava/client.py	2011-03-07 17:58:46 +0000
+++ lava/client.py	2011-03-11 00:48:58 +0000
@@ -1,9 +1,8 @@
 import pexpect
 import sys
 import time
-from lava.config import Board, BeagleBoard, PandaBoard
-from lava.config import Mx51ekvBoard, VexpressBoard
-from lava.config import Boards, LAVA_SERVER_IP
+
+from lava.config import BOARDS, LAVA_SERVER_IP
 
 class LavaClient:
     def __init__(self, hostname):
@@ -11,8 +10,9 @@
         self.proc = pexpect.spawn(cmd, timeout=300, logfile=sys.stdout)
         #serial can be slow, races do funny things if you don't increase delay
         self.proc.delaybeforesend=1
-        #This is temporary, eventually this should come from the db
-        self.target = Boards[hostname]
+        self.hostname = hostname
+        # will eventually come from the database
+        self.board = BOARDS[hostname]
 
     def in_master_shell(self):
         """ Check that we are in a shell on the master image
@@ -53,7 +53,7 @@
         except:
             self.hard_reboot()
             self.enter_uboot()
-        uboot_cmds = self.target.uboot_cmds
+        uboot_cmds = self.board.uboot_cmds
         self.proc.sendline(uboot_cmds[0])
         for line in range(1, len(uboot_cmds)):
             self.proc.expect("#")

=== modified file 'lava/config.py'
--- lava/config.py	2011-03-07 17:58:46 +0000
+++ lava/config.py	2011-03-11 00:48:58 +0000
@@ -6,67 +6,43 @@
 """
 
 class Board(object):
-    def __init__(self, name):
-        self.name = name
-
-    def change_uboot_cmds(self, uboot_cmds):
-        self.uboot_cmds = uboot_cmds
+    pass
 
 class BeagleBoard(Board):
-    def __init__(self, name):
-        Board.__init__(self, name)
-        self.uboot_cmds = ["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"]
+    uboot_cmds = ["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"]
 
 class PandaBoard(Board):
-    def __init__(self, name):
-        Board.__init__(self, name)
-        self.uboot_cmds = ["mmc init",
-            "setenv bootcmd 'fatload mmc 0:5 0x80200000 uImage; fatload mmc " \
-            "0:5 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"]
+    uboot_cmds = ["mmc init",
+        "setenv bootcmd 'fatload mmc 0:5 0x80200000 uImage; fatload mmc "
+        "0:5 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 Mx51evkBoard(Board):
-    def __init__(self, name):
-        Board.__init__(self, name)
-        self.uboot_cmds = ["mmc init",
-            "setenv bootcmd 'fatload mmc 0:5 0x90800000 uImage; fatload mmc " \
-            "0:5 0x90800000 uInitrd; bootm 0x90000000 0x90800000'",
-            "setenv bootargs ' console=tty0 console=ttymxc0,115200n8 " \
-            "root=LABEL=testrootfs rootwait ro'",
-            "boot"]
-
-class VexpressBoard(Board):
-    def __init__(self, name):
-        Board.__init__(self, name)
-        #vexpress board uboot cmds is not exact here, please check if a board
-        #is available
-        self.uboot_cmds = ["mmc init",
-            "setenv bootcmd 'fatload mmc 0:5 0x80000000 uImage; fatload mmc " \
-            "0:5 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"]
+    uboot_cmds = ["mmc init",
+        "setenv bootcmd 'fatload mmc 0:5 0x90800000 uImage; fatload mmc "
+        "0:5 0x90800000 uInitrd; bootm 0x90000000 0x90800000'",
+        "setenv bootargs ' console=tty0 console=ttymxc0,115200n8 "
+        "root=LABEL=testrootfs rootwait ro'",
+        "boot"]
 
 #Here, it still needs to maintain a map from boardid to board, for there is only
 #boardid in jobfile.json
-Boards = {
-        "panda01": PandaBoard("panda01"),
-        "panda02": PandaBoard("panda02"),
-        "beagle01": BeagleBoard("beagle01"),
-        "vexpress01": VexpressBoard("vexpress01"),
-        "vexpress02": VexpressBoard("vexpress02"),
-        "bbg01": Mx51evkBoard("bbg01"),
+BOARDS = {
+        "panda01": PandaBoard,
+        "panda02": PandaBoard,
+        "beagle01": BeagleBoard,
+        "bbg01": Mx51evkBoard,
         }
 
 #Main LAVA server IP in the boards farm
 LAVA_SERVER_IP = "192.168.1.10"
+

=== modified file 'lava/tests/test_config.py'
--- lava/tests/test_config.py	2011-03-07 17:58:46 +0000
+++ lava/tests/test_config.py	2011-03-11 00:48:58 +0000
@@ -1,9 +1,9 @@
 from unittest import TestCase
-from lava.config import Board, BeagleBoard, PandaBoard, Mx51ekvBoard
-from lava.config import Boards, LAVA_SERVER_IP
+
+from lava.config import BOARDS, LAVA_SERVER_IP
 
 class TestConfigData(TestCase):
-    def test_beaglexm01_uboot_cmds(self):
+    def test_beagle01_uboot_cmds(self):
         expected = [
             "mmc init",
             "setenv bootcmd 'fatload mmc 0:3 0x80000000 uImage; fatload mmc "
@@ -13,7 +13,7 @@
                 "nocompcache vram=12M omapfb.debug=y "
                 "omapfb.mode=dvi:1280x720MR-16@60'",
             "boot"]
-        brd = Boards["beaglexm01"]
+        brd = BOARDS["beagle01"]
         uboot_cmds = brd.uboot_cmds
         self.assertEquals(expected, uboot_cmds)