Merge lp:~asac/phablet-tools/wait-for-online-with-nm-tool into lp:phablet-tools

[Alexander Sack]

based on lp:~asac/phablet-tools/improve-network-bringup-console-output this code moves to nm-tool for deciding whether a device is online or not...

This time I tested the code for the positive state (dev is online) and negative (stop network-manager).

I don't like the sh -c "..." way of doing this, but couldn't get the | easily wrapped in a variable without doing it that way :)...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:131
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~asac/phablet-tools/wait-for-online-with-nm-tool/+merge/174893/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/99/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:131
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~asac/phablet-tools/wait-for-online-with-nm-tool/+merge/174894/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/43

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/100/rebuild

review: Needs Fixing (continuous-integration)

[Alexander Sack (asac)]

Can the bot be ignored for this one? seems that it succeeded ci job 43, but then it failed in the end.

[Oliver Grawert (ogra)]

is there any valid reason to use "sh -c" in a shell script (teh execution of the command will spawn a subshell anyway, you just add one more to the stack here)

[Sergio Schvezov (sergiusens)]

On Tue, Jul 16, 2013 at 4:57 AM, Alexander Sack <email address hidden> wrote:
> Can the bot be ignored for this one? seems that it succeeded ci job 43, but then it failed in the end.

It only failed because there was no 'Commit message' setup in
launchpad (the message used for the merge commit).

[Alexander Sack (asac)]

so can this or something similar bemerged?

[Oliver Grawert (ogra)]

changing these two lines from:

nm_tool="adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/usr/bin/nm-tool"
nm_tool_is_online="adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/usr/bin/nm-tool | grep -q State.*[^s]connected.*global"

to:

nm_tool=$(adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/usr/bin/nm-tool)
nm_tool_is_online=$(adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/usr/bin/nm-tool | grep -q State.*[^s]connected.*global)

should make the sh -c unneeded ...

Unmerged revisions

131. By Alexander Sack on 2013-07-15

simplify device bringup "wait for online state" code; use nm-tool in phablet-network-setup

130. By Alexander Sack on 2013-07-15

improve debugging output of network device and IP bringup code in phablet-network-setup

=== modified file 'phablet-network-setup'
--- phablet-network-setup	2013-07-15 23:49:28 +0000
+++ phablet-network-setup	2013-07-15 23:49:28 +0000
@@ -144,31 +144,26 @@
 apt-get install --yes openssh-server iw
 EOF
 
-    echo Bringing up Network device...
-    nmcli_cmd="adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/usr/bin/nmcli"
-    wait=0
-    iface=$($nmcli_cmd -t -f devices con status | tr -d '\r')
-    until [ -n "$iface" ] || [ $wait -eq 10 ]; do
-        echo "Network device ready yet:"
-	$nmcli_cmd c list
-        sleep $(( wait++ ))
-        iface=$($nmcli_cmd -t -f devices con status | tr -d '\r')
-    done
-    if [ -z "$iface" ]; then
-        echo "Network device setup timed out. Bailing out!"
-        exit 1
-    fi
-    wait=0
-    echo Bringing up Network IP for \"$iface\" ...
-    ip_data=$($nmcli_cmd -t dev list iface $iface | grep ADDRESS)
-    until [ -n "$ip_data" ] || [ $wait -eq 10 ]; do
-        echo "Network device \"$iface\" has no IP yet:"
-        sleep $(( wait++ ))
-        ip_data=$($nmcli_cmd -t dev list iface $iface | grep ADDRESS)
-    done
-    if [ -z "$ip_data" ]; then
-        echo "Network IP setup \"$iface\" timed out. Bailing out!"
-        exit 1
+    echo Bringing up Network...
+    nm_tool="adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/usr/bin/nm-tool"
+    nm_tool_is_online="adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/usr/bin/nm-tool | grep -q State.*[^s]connected.*global"
+
+    wait=0
+    sh -c "$nm_tool_is_online" && is_online=yes
+    until [ -n "$is_online" ] || [ $wait -eq 13 ]; do
+        echo "Network connected yet:"
+	$nm_tool
+        sleep $(( wait++ ))
+        sh -c "$nm_tool_is_online" && is_online=yes
+	echo Is now online? $online
+    done
+    if [ -z "$is_online" ]; then
+        echo "Network bringup timed out..."
+	$nm_tool
+        echo "Bailing out!"
+        exit 1
+    else
+	echo "Network is online! online=$is_online"
     fi
 
     echo Installing ssh