Merge lp:~doanac/utah/phablet-network into lp:utah

[Andy Doan]

we need to update our calls for phablet-network as per:

 http://bazaar.launchpad.net/~phablet-team/phablet-tools/trunk/revision/171

[Chris Johnston (cjohnston)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Looks fine

 review approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)

iQQcBAEBAgAGBQJSHNToAAoJEAwLwog889GlDFcgAJsRVCMjG4tW8nrn91BRadhI
5FlC1Mu6/PTS6umPMyM5aPY2HdQNoAI1LuJasol2wOUg8eqPFBT8QlnMV3mI+fFp
EUa+pcsWm8j4G0WTYeDR6qxigqNXqrrUad+nqQwEdBwlmpU+gZNWGMRwQHkhm8JY
pVN32MOTod9FFmRAI9ue1cwH5LZUDe/RJWNR9X531XeqzxhH3W7KoSzBDOq3/vEw
Sbk4ImktrJalkSwrKlnXUXuv2pfUGnElmpBvCbxjfFpGYfZ1rfXCzN0KPfwdL75k
nLdfCaLGu2onROardhuJ37LLXVAK1BD8k2mpQMZD57pGQobD8P+6Z4+ovTx19urW
Dlwbz2bmj5WuI2Q/FmJ/s04a1KeUGZMfBXPxV0Rz9m4//9AmaIQvtg/QLy/wNXRw
vpt7FchzZEzjsm9Ie9DNxVVxjqxxiA6TR/yqzZpwKg/PmrWERsfoirNFaAXplcgy
utCGfvVHkmqs+ryGl5SJunOtf66Jeo2a3Ep5Rep4DD8mms5/eNXhTYJez+e2KwnS
qWAayop/DHxRWmUmceG/Cmp3FaPextn7BROkrnHg+YlcLz5cuuj6XJzgyJEGFlrC
uFCL5WgB19O7LhQOA1QcdFGk0G2Xl0O8OTpJHtZy5QPHAkUWbSBlTCU5JOsNQeOQ
TZA6lORusdI1YXXRaH4We4ZQtDk27iIKVU+wpvBoe65EgqurvstJcS/Q143P5xzs
2/i2ZbmPloVGUhOJqyAAzbiO71NohoDeHvBFHpouB5gx34PSBqLrWCMxvOAyzVMT
fStPy8f4ECIe7X3enAJEtXr9d3LPKz8Y/BNFiLuba2HAKiWTFTMOpG3t9rZNsWXM
Qg4D3LKM18szdj8T1sDXR37Md2jTwU+lJ27Ll3ltJQCGwPN735RZfd+BQ526ZaHH
VEtdKFC1/zeMzZXPS3xXu8UWCpLxR9q7YgZ0ilv177CrgruU5fKo2BXDaJR8xApC
tcja/TIdtdggCXj417/2GZIfUtCV1YUzMBpN2IVNLY18VJ7LSantOsYA7s/mC/3Q
7RBSlnpqOjtQyTil0swRR+oYnS59FbKLy4tiYUR4OsGLW8A7cysZzk9EGzH10oZM
1eRx9tQgWvUzgqrfd34HhjOrs6tNa6W2CQcpDCiUbhTDOrjzX4Cf1qOJlvgRRZ3a
nrAphom3MZOnqV53kqirygrXcv+dtpDSxNVC/67anBMJS9gfi00f7Tk7HU4qTt8T
VzqtpuwI74RHyxQiifzkkrlSUMCIYHhQaIgYQSmOm5rlf46fo48dYJbnOelOVkC3
PiJ1EEzsgyh33PimcHXmggfO1ynYAMuv2X5Lso1LU8Ej7dks4nPjm8IQ8+XE0LY=
=UH7W
-----END PGP SIGNATURE-----

review: Approve

[Max Brustkern (nuclearbob)]

Seems reasonable to me.

review: Approve

=== modified file 'examples/run_utah_phablet.py'
--- examples/run_utah_phablet.py	2013-08-23 16:31:13 +0000
+++ examples/run_utah_phablet.py	2013-08-27 16:31:37 +0000
@@ -86,7 +86,7 @@
 
 @phablet_tools_errors
 def _network(args):
-    cmd = ['phablet-network-setup']
+    cmd = ['phablet-network']
     if args.serial:
         cmd.extend(['-s', args.serial])
     if args.network_file:

=== modified file 'utah/provisioning/touch.py'
--- utah/provisioning/touch.py	2013-08-09 19:30:05 +0000
+++ utah/provisioning/touch.py	2013-08-27 16:31:37 +0000
@@ -109,38 +109,16 @@
         self._adb_operation(['wait-for-device'])
 
     def wait_for_network(self):
-        """Wait for networking to be up and running on the target.
-
-        We often see "something wicked happened" errors. These can be worked
-        around by doing a simple check. This check ensures both ping works
-        and also DNS resolution.
-
-        NOTE: the QA lab blocks ICMP, so we can't check the success of ping.
-
-        """
-        script = '/usr/local/bin/utah-wait-for-network'
-        content = [
-            '#!/bin/sh',
-            'cleanup() {',
-            '    ifconfig',
-            '    exit 99',
-            '}',
-            'ifconfig -a',
-            'trap cleanup TERM INT',  # add some debugging if we fail
-            'while true ; do',
-            '    if ping -c1 launchpad.net 2>/dev/null | grep PING ; then',
-            '        exit 0',
-            '    fi',
-            'done',
-            '',
-        ]
-        self.create_file_ubuntu(script, '\n'.join(content), '755')
+        """Wait for networking to be up and running on the target"""
+        args = ['phablet-network', '--skip-setup']
+        if self._serial:
+            args.extend(['-s', self._serial])
         try:
-            self.run_ubuntu('timeout 60s {}'.format(script))
-        except ADBShellError:
+            subprocess.check_call(args)
+        except subprocess.CalledProcessError:
             self._log('wait for network failed, rebooting and retrying...')
             self.reboot_and_wait()
-            self.run_ubuntu('timeout 60s {}'.format(script))
+            subprocess.check_call(args)
 
     def run_ubuntu(self, cmd, stream=True):
         """Run a command from the Ubuntu environment.