Merge lp:~qzhang/lava-dispatcher/bringup-network into lp:lava-dispatcher

[Spring Zhang]

Try to bring up the network if necessary:
1. meet a strange behavior of pexpect
2. I met timeout issue in pexpect
Will check if my pexpect library error.

Detecting if network is ok is already done by check_network_up.

[Paul Larson (pwlars)]

15 + if self.board.type == "vexpress":
16 + iface_str = "usb"
vexpress is not the only board with a usb network interface. I think we can take a simpler approach to this. Search for ethX first, and use it if we find it. If not, search for usbX. Maybe do it in a bit cleaner way if possible too.

18 + self.proc.sendline(
19 + "LC_ALL=C ifconfig -a | grep -i '^%s. ' | wc -l"
20 + % iface_str)
21 + id = self.proc.expect(["1", "0"], timeout=5)
22 + self.proc.expect(response_str)
23 + # fix it, strange: id will be 1 when eth0 is found
24 + if id == 1:
25 + raise NetworkError("Ethernet interface not found")
26 + elif id > 1:
27 + raise NetworkError("Ethernet interfaces are not unique")
The 'id' returned matches which entry in the list it found, not the exact text that it found.

42 + #bring up ethernet
43 + self.run_shell_command("ifconfig %s up" % iface,
44 + response = response_str)
45 + self.run_shell_command("dhclient %s" % iface,
46 + response = response_str)
We don't want to bring up the network like this. DHCP is not going to be reliable for us in the long run, as we need a predictable ip address on the board. We don't even have a predictable mac address in all cases, so dhcp is not an option.

review: Needs Fixing

[lp:~qzhang/lava-dispatcher/bringup-network]

45. By Spring Zhang on 2011-04-21

match network interface ethX then usbX

46. By Spring Zhang on 2011-04-21

delete DHCP network probe up code, add a TODO for adding manual network probing up code

[Spring Zhang (qzhang)]

Thanks for the comments.

> 15 + if self.board.type == "vexpress":
> 16 + iface_str = "usb"
> vexpress is not the only board with a usb network interface. I think we can
> take a simpler approach to this. Search for ethX first, and use it if we find
> it. If not, search for usbX. Maybe do it in a bit cleaner way if possible
> too.
I have done that in this way, it will search eth0...eth9 and then usb0...usb9

>
> 18 + self.proc.sendline(
> 19 + "LC_ALL=C ifconfig -a | grep -i '^%s. ' | wc -l"
> 20 + % iface_str)
> 21 + id = self.proc.expect(["1", "0"], timeout=5)
> 22 + self.proc.expect(response_str)
> 23 + # fix it, strange: id will be 1 when eth0 is found
> 24 + if id == 1:
> 25 + raise NetworkError("Ethernet interface not found")
> 26 + elif id > 1:
> 27 + raise NetworkError("Ethernet interfaces are not unique")
> The 'id' returned matches which entry in the list it found, not the exact text
> that it found.
I've got the answer why it confused me.

>
> 42 + #bring up ethernet
> 43 + self.run_shell_command("ifconfig %s up" % iface,
> 44 + response = response_str)
> 45 + self.run_shell_command("dhclient %s" % iface,
> 46 + response = response_str)
> We don't want to bring up the network like this. DHCP is not going to be
> reliable for us in the long run, as we need a predictable ip address on the
> board. We don't even have a predictable mac address in all cases, so dhcp is
> not an option.

I deleted DHCP code and add an TODO for Dave to add manual probing up code.

Unmerged revisions

46. By Spring Zhang on 2011-04-21

delete DHCP network probe up code, add a TODO for adding manual network probing up code

45. By Spring Zhang on 2011-04-21

match network interface ethX then usbX

44. By Spring Zhang on 2011-04-19

remove network checking for it can be done by caller

43. By Spring Zhang on 2011-04-19

remove simple test

42. By Spring Zhang on 2011-04-19

meet a strange behaviour of pexpect

41. By Spring Zhang on 2011-04-19

avoid private address iface like eth0:avahi after dhclient when no network

40. By Spring Zhang on 2011-04-19

add network bring up

=== modified file 'lava/dispatcher/client.py'
--- lava/dispatcher/client.py	2011-04-11 21:00:19 +0000
+++ lava/dispatcher/client.py	2011-04-21 06:47:19 +0000
@@ -99,6 +99,34 @@
                 return
         raise NetworkError
 
+    def bring_up_network(self, response_str=MASTER_STR):
+        """
+        Need to check if network is up by check_network_up by caller first
+        Assume default image is master
+        """
+        for iface_str in ["eth", "usb"]:
+            iface_list = []
+            for i in range(10):
+                iface_list.append("%s%i" % (iface_str, i))
+            iface_list.append(pexpect.TIMEOUT)
+            # Get network interface
+            self.proc.sendline("LC_ALL=C ifconfig -a")
+            id = self.proc.expect(iface_list, timeout=5)
+            self.proc.expect(response_str)
+            if id < 10:
+                iface = iface_str + str(id)
+                break
+            elif id > 10:
+                raise NetworkError("Ethernet interface index is too large")
+
+        try:
+            iface
+        except NameError:
+            raise NetworkError("Ethernet interface not found")
+
+        #TODO: bring up ethernet manually, not by DHCP
+
+
     def export_display(self):
         #export the display, ignore errors on non-graphical images
         self.run_shell_command("su - linaro -c 'DISPLAY=:0 xhost local:'",
@@ -115,4 +143,3 @@
 
 class OperationFailed(Exception):
     pass
-