Merge lp:~bzoltan/phablet-tools/different_nmcli_for_vivid into lp:phablet-tools

[Zoltan Balogh]

Use different nmcli command on 15.04 than on 14.10 or 14.04

Use different nmcli command on 15.04 than on 14.10 or 14.04

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:336
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/434/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/11

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

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Tested the new nmcli command on vivid and it seems to work fine. Much appreciated!

review: Approve

[Brendan Donegan (brendan-donegan)]

I would do 'wireless_adapter="$(nmcli -t -f device,type dev | egrep "wireless|wifi" | cut -d: -f1)"' before the case statement to reduce the amount of duplicated code. Also you *might* want to specify --active to nmcli connection show just to make sure we only ever use an active connection, but it's not essential since you grep for the adapter name and that only is shown on active connections.

Neither of these changes are essential, just suggestions

review: Needs Information

[Brendan Donegan (brendan-donegan)]

Actually now I think about it, there is one thing wrong here - the approach to choosing the command. Really the lsb_release output isn't what's relevant - it's the nmcli version. Check with cyphermox from which version the command changed and use the output of nmcli -v or dpkg -l to check the version.

review: Needs Fixing

[Brendan Donegan (brendan-donegan)]

> Actually now I think about it, there is one thing wrong here - the approach to
> choosing the command. Really the lsb_release output isn't what's relevant -
> it's the nmcli version. Check with cyphermox from which version the command
> changed and use the output of nmcli -v or dpkg -l to check the version.

e.g. if the lowest version with the change is 0.9.10 do:

dpkg --compare-versions $installed_version '>=' 0.9.10

[Oliver Grawert (ogra)]

there is a bunch of things wrong that needs some cleanup

you should only switch a variable based on the nmcli --version output:

ver=$(nmcli --version|sed 's/^.* //')

if $(dpkg --compare-versions ... )...

then keep the commands generic and just replace some version contents or command options that way ypur if/then becomes a lot cleaner and boils down to about 5 lines:

network_active_uuid="$(LC_ALL=C nmcli $nmcli_commands|grep $wireless_adapter| generric_post_processing)

wireless_adapter="$(nmcli -t -f device,type dev | egrep $wifitype | cut -d: -f1)"

[Zoltan Balogh (bzoltan)]

In utopic the nmcli is on 0.9.8.8 and in vivid is on 0.9.10.0

[Oliver Grawert (ogra)]

http://paste.ubuntu.com/10158481/ has a cleaned up version that should work (untested)

[Oliver Grawert (ogra)]

review: Needs Fixing

[Oliver Grawert (ogra)]

and with brendans change (which i missed above):

http://paste.ubuntu.com/10158670/

[Oliver Grawert (ogra)]

cool, thanks for updating, looks very good now

review: Approve

[Brendan Donegan (brendan-donegan)]

Such cleaner, very approved

review: Approve

[Leo Arias (elopio)]

Why is this work in progress? seems everybody likes it, and we need it for the sanity suite automation. Can you please land it?

=== modified file 'phablet-network'
--- phablet-network	2014-09-23 17:55:51 +0000
+++ phablet-network	2015-02-10 14:54:21 +0000
@@ -96,13 +96,12 @@
 NETWORK_MANAGER=/etc/NetworkManager/system-connections
 
 find_active_network() {
-    wireless_adapter="$(nmcli -t -f device,type dev | egrep wireless | cut -d: -f1)"
-    if [ -z "$wireless_adapter" ]
-    then
-        echo "No wireless adapter found, exiting"
-        exit 1
+    nmcli_cmd="-t -f name,uuid,devices con status"
+    if $(dpkg --compare-versions "$(nmcli --version|sed 's/^.* //')" gt 0.9.8.8); then 
+        nmcli_cmd="-t -f name,uuid,device con show"
     fi
-   network_active_uuid="$(LC_ALL=C nmcli -t -f name,uuid,devices,vpn con status | grep $wireless_adapter | egrep ':no$'| cut -d: -f2)"
+    wireless_adapter="$(nmcli -t -f device,type dev | egrep "wireless|wifi" | cut -d: -f1)"
+    network_active_uuid="$(LC_ALL=C nmcli $nmcli_cmd | grep $wireless_adapter | cut -d: -f2)"
     if [ -z "$network_active_uuid" ]
     then
         echo "No active wifi network connection, exiting"