Merge lp:~qzhang/lava-dispatcher/refactor-install-abrek into lp:lava-dispatcher

[Spring Zhang]

use cmd_seq list to reduce some duplicated code in cmd_install_abrek() in abrek.py

[lp:~qzhang/lava-dispatcher/refactor-install-abrek]

24. By Spring Zhang on 2011-03-31

1. fix a minor error
2. summary run cmd_seq to a method in LavaClient
3. modify deploy.py by new method

[Spring Zhang (qzhang)]

create a new method run_shell_cmd_seq() in LavaClient to run a command sequence, also applied to deploy.py

review: Needs Resubmitting

[lp:~qzhang/lava-dispatcher/refactor-install-abrek]

25. By Spring Zhang on 2011-04-05

merge from mainline r22

[Spring Zhang (qzhang)]

How about the cmd_seq() method?

[Michael Hudson-Doyle (mwhudson)]

I think something like this is still a good idea, but this branch must conflict horribly by now.

Unmerged revisions

25. By Spring Zhang on 2011-04-05

merge from mainline r22

24. By Spring Zhang on 2011-03-31

1. fix a minor error
2. summary run cmd_seq to a method in LavaClient
3. modify deploy.py by new method

23. By Spring Zhang on 2011-03-30

use cmd_seq list to reduce some duplicated code

22. By Spring Zhang on 2011-03-30

copy cmds to list

=== modified file 'dispatcher/actions/abrek.py'
--- dispatcher/actions/abrek.py	2011-03-30 14:31:59 +0000
+++ dispatcher/actions/abrek.py	2011-04-05 16:01:17 +0000
@@ -22,65 +22,44 @@
     def run(self, tests):
         #Make sure in master image
         #, or exception can be caught and do boot_master_image()
+        client = self.client
         try:
-            self.client.in_master_shell()
+            client.in_master_shell()
         except:
-            self.client.boot_master_image()
-
-        #install bazaar in tester image
-        self.client.run_shell_command(
-            'mkdir -p /mnt/root',
-            response = MASTER_STR)
-        self.client.run_shell_command(
-            'mount /dev/disk/by-label/testrootfs /mnt/root',
-            response = MASTER_STR)
-        self.client.run_shell_command(
-            'cp -f /mnt/root/etc/resolv.conf /mnt/root/etc/resolv.conf.bak',
-            response = MASTER_STR)
-        self.client.run_shell_command(
-            'cp -L /etc/resolv.conf /mnt/root/etc',
-            response = MASTER_STR)
-        #eliminate warning: Can not write log, openpty() failed 
-        #                   (/dev/pts not mounted?), does not work
-        self.client.run_shell_command(
-            'mount --rbind /dev /mnt/root/dev',
-            response = MASTER_STR)
-        self.client.run_shell_command(
-            'chroot /mnt/root apt-get update',
-            response = MASTER_STR)
-        #Install necessary packages for build abrek
-        self.client.run_shell_command(
-            'chroot /mnt/root apt-get -y install bzr python-apt python-distutils-extra',
-            response = MASTER_STR, timeout=2400)
-        self.client.run_shell_command(
-            'chroot /mnt/root bzr branch lp:abrek',
-            response = MASTER_STR)
-        self.client.run_shell_command(
-            'chroot /mnt/root sh -c "cd abrek && python setup.py install"',
-            response = MASTER_STR)
+            client.boot_master_image()
+
+        #Construct command sequence list
+        cmd_seq = [ 
+            ['mkdir -p /mnt/root',],
+            ['mount /dev/disk/by-label/testrootfs /mnt/root',],
+            ['cp -f /mnt/root/etc/resolv.conf /mnt/root/etc/resolv.conf.bak',],
+            ['cp -L /etc/resolv.conf /mnt/root/etc',],
+            #eliminate warning: Can not write log, openpty() failed 
+            #                   (/dev/pts not mounted?), does not work
+            ['mount --rbind /dev /mnt/root/dev',],
+            ['chroot /mnt/root apt-get update',],
+            #Install necessary packages for build abrek
+            ['chroot /mnt/root apt-get -y install bzr python-apt python-distutils-extra', 2400],
+            ['chroot /mnt/root bzr branch lp:abrek',],
+            ['chroot /mnt/root sh -c "cd abrek && python setup.py install"',]
+                ]
+        for test in tests:
+            cmd_seq.append(['chroot /mnt/root abrek install %s' % test,])
+        #clean up
+        cmd_seq = cmd_seq + [
+            ['cp -f /mnt/root/etc/resolv.conf.bak /mnt/root/etc/resolv.conf',],
+            ['rm -rf /mnt/root/abrek',],
+            ['cat /proc/mounts | awk \'{print $2}\' | grep "^/mnt/root/dev" | sort -r | xargs umount',]
+                ]
+
+        client.run_shell_cmd_seq(cmd_seq)
 
         #Test if abrek installed
         try:
-            self.client.run_shell_command(
+            client.run_shell_command(
                 'chroot /mnt/root abrek help',
                 response = "list-tests", timeout = 10)
         except:
             raise OperationFailed("abrek deployment failed")
 
-        for test in tests:
-            self.client.run_shell_command(
-                'chroot /mnt/root abrek install %s' % test,
-                response = MASTER_STR)
-        #clean up
-        self.client.run_shell_command(
-            'cp -f /mnt/root/etc/resolv.conf.bak /mnt/root/etc/resolv.conf',
-            response = MASTER_STR)
-        self.client.run_shell_command(
-            'rm -rf /mnt/root/abrek',
-            response = MASTER_STR)
-        self.client.run_shell_command(
-            'cat /proc/mounts | awk \'{print $2}\' | grep "^/mnt/root/dev" | sort -r | xargs umount',
-            response = MASTER_STR)
-        self.client.run_shell_command(
-            'umount /mnt/root',
-            response = MASTER_STR)
+        client.run_shell_command('umount /mnt/root', response = MASTER_STR)

=== modified file 'dispatcher/actions/deploy.py'
--- dispatcher/actions/deploy.py	2011-03-30 14:31:59 +0000
+++ dispatcher/actions/deploy.py	2011-04-05 16:01:17 +0000
@@ -118,45 +118,27 @@
         return boot_tgz, root_tgz
 
     def deploy_linaro_rootfs(self, rootfs):
-        client = self.client
+        cmd_seq = [
+            ['mkfs.ext3 -q /dev/disk/by-label/testrootfs -L testrootfs', ],
+            ['udevadm trigger',],
+            ['mkdir -p /mnt/root',],
+            ['mount /dev/disk/by-label/testrootfs /mnt/root',],
+            ['wget -qO- %s |tar --numeric-owner -C /mnt/root -xzf -' % rootfs, 600],
+            ['umount /mnt/root',]
+                ]
+
         print "Deploying linaro image"
-        client.run_shell_command(
-            'mkfs.ext3 -q /dev/disk/by-label/testrootfs -L testrootfs',
-            response = MASTER_STR)
-        client.run_shell_command(
-            'udevadm trigger',
-            response = MASTER_STR)
-        client.run_shell_command(
-            'mkdir -p /mnt/root',
-            response = MASTER_STR)
-        client.run_shell_command(
-            'mount /dev/disk/by-label/testrootfs /mnt/root',
-            response = MASTER_STR)
-        client.run_shell_command(
-            'wget -qO- %s |tar --numeric-owner -C /mnt/root -xzf -' % rootfs,
-            response = MASTER_STR, timeout = 600)
-        client.run_shell_command(
-            'umount /mnt/root',
-            response = MASTER_STR)
+        self.client.run_shell_cmd_seq(cmd_seq)
 
     def deploy_linaro_bootfs(self, bootfs):
-        client = self.client
-        client.run_shell_command(
-            'mkfs.vfat /dev/disk/by-label/testboot -n testboot',
-            response = MASTER_STR)
-        client.run_shell_command(
-            'udevadm trigger',
-            response = MASTER_STR)
-        client.run_shell_command(
-            'mkdir -p /mnt/boot',
-            response = MASTER_STR)
-        client.run_shell_command(
-            'mount /dev/disk/by-label/testboot /mnt/boot',
-            response = MASTER_STR)
-        client.run_shell_command(
-            'wget -qO- %s |tar --numeric-owner -C /mnt/boot -xzf -' % bootfs,
-            response = MASTER_STR)
-        client.run_shell_command(
-            'umount /mnt/boot',
-            response = MASTER_STR)
+        cmd_seq = [
+            ['mkfs.vfat /dev/disk/by-label/testboot -n testboot',],
+            ['udevadm trigger',],
+            ['mkdir -p /mnt/boot',],
+            ['mount /dev/disk/by-label/testboot /mnt/boot',],
+            ['wget -qO- %s |tar --numeric-owner -C /mnt/boot -xzf -' % bootfs,],
+            ['umount /mnt/boot',],
+                ]
+
+        self.client.run_shell_cmd_seq(cmd_seq)
 

=== modified file 'dispatcher/client.py'
--- dispatcher/client.py	2011-03-30 14:40:29 +0000
+++ dispatcher/client.py	2011-04-05 16:01:17 +0000
@@ -76,6 +76,18 @@
         if response:
             self.proc.expect(response, timeout=timeout)
 
+    def run_shell_cmd_seq(self, cmd_seq):
+        """
+        cmd_seq is assumed to be a list: 
+        [[cmd1, timeout1], [cmd2, timeout2], ...]
+        """
+        for cmd in cmd_seq:
+            if len(cmd) == 1:
+                self.client.run_shell_command(cmd[0], response = MASTER_STR)
+            else:
+                self.client.run_shell_command(cmd[0], response = MASTER_STR,
+                    timeout = cmd[1])
+
     def check_network_up(self):
         self.proc.sendline("LC_ALL=C ping -W4 -c1 %s" % LAVA_SERVER_IP)
         id = self.proc.expect(["1 received", "0 received",