wifi_nmcli_test: remove trusty support as EOL

1 files changed, 16 insertions, 58 deletions

diff --git a/bin/wifi_nmcli_test.py b/bin/wifi_nmcli_test.py
index 91d6398..5e5cb6e 100755
--- a/bin/wifi_nmcli_test.py
+++ b/bin/wifi_nmcli_test.py
@@ -17,8 +17,6 @@ import subprocess as sp
 import sys
 import time
 
-from distutils.version import LooseVersion
-
 
 print = functools.partial(print, flush=True)
 
@@ -31,17 +29,6 @@ def print_cmd(cmd):
 print("+", cmd)
 
 
-def legacy_nmcli():
- cmd = "nmcli -v"
- output = sp.check_output(cmd, shell=True)
- version = LooseVersion(output.strip().split()[-1].decode())
- # check if using an earlier nmcli version with different api
- # nmcli in trusty is 0.9.8.8
- if version < LooseVersion("0.9.9"):
- return True
- return False
-
-
 def cleanup_nm_connections():
 print_head("Cleaning up NM connections")
 cmd = "nmcli -t -f TYPE,UUID,NAME c"
@@ -51,10 +38,7 @@ def cleanup_nm_connections():
 type, uuid, name = line.strip().split(':')
 if type == '802-11-wireless':
 print("Deleting connection", name)
- if legacy_nmcli():
- cmd = "nmcli c delete uuid {}".format(uuid)
- else:
- cmd = "nmcli c delete {}".format(uuid)
+ cmd = "nmcli c delete {}".format(uuid)
 print_cmd(cmd)
 sp.call(cmd, shell=True)
 print()
@@ -77,27 +61,18 @@ def device_rescan():
 def list_aps(args):
 print_head("List APs")
 count = 0
- if legacy_nmcli():
- fields = "SSID,FREQ,SIGNAL"
- cmd = "nmcli -t -f {} d wifi list iface {}".format(fields, args.device)
- else:
- fields = "SSID,CHAN,FREQ,SIGNAL"
- cmd = "nmcli -t -f {} d wifi list ifname {}".format(
- fields, args.device)
+ fields = "SSID,CHAN,FREQ,SIGNAL"
+ cmd = "nmcli -t -f {} d wifi list ifname {}".format(
+ fields, args.device)
 print_cmd(cmd)
 output = sp.check_output(cmd, shell=True)
 for line in output.decode(sys.stdout.encoding).splitlines():
 # lp bug #1723372 - extra line in output on zesty
 if line.strip() == args.device:
 continue
- if legacy_nmcli():
- ssid, frequency, signal = line.strip().split(':')
- print("SSID: {} Freq: {} Signal: {}".format(
- ssid, frequency, signal))
- else:
- ssid, channel, frequency, signal = line.strip().split(':')
- print("SSID: {} Chan: {} Freq: {} Signal: {}".format(
- ssid, channel, frequency, signal))
+ ssid, channel, frequency, signal = line.strip().split(':')
+ print("SSID: {} Chan: {} Freq: {} Signal: {}".format(
+ ssid, channel, frequency, signal))
 if hasattr(args, 'essid'):
 if ssid == args.essid:
 count += 1
@@ -109,20 +84,12 @@ def list_aps(args):
 
 def open_connection(args):
 print_head("Connection attempt")
- if legacy_nmcli():
- cmd = "nmcli d wifi connect {} iface {} name TEST_CON".format(
- args.essid, args.device)
- else:
- cmd = "nmcli d wifi connect {} ifname {} name TEST_CON".format(
- args.essid, args.device)
+ cmd = "nmcli d wifi connect {} ifname {} name TEST_CON".format(
+ args.essid, args.device)
 print_cmd(cmd)
 sp.call(cmd, shell=True)
- if legacy_nmcli():
- cmd = ("nmcli -m tabular -t -f GENERAL d list | grep {} | "
- "awk -F: '{{print $15}}'".format(args.device))
- else:
- cmd = "nmcli -m tabular -t -f GENERAL.STATE d show {}".format(
- args.device)
+ cmd = "nmcli -m tabular -t -f GENERAL.STATE d show {}".format(
+ args.device)
 print_cmd(cmd)
 output = sp.check_output(cmd, shell=True)
 state = output.decode(sys.stdout.encoding).strip()
@@ -136,20 +103,12 @@ def open_connection(args):
 
 def secured_connection(args):
 print_head("Connection attempt")
- if legacy_nmcli():
- cmd = ("nmcli d wifi connect {} password {} iface {} name "
- "TEST_CON".format(args.essid, args.psk, args.device))
- else:
- cmd = ("nmcli d wifi connect {} password {} ifname {} name "
- "TEST_CON".format(args.essid, args.psk, args.device))
+ cmd = ("nmcli --wait 180 d wifi connect {} password {} ifname {} name "
+ "TEST_CON".format(args.essid, args.psk, args.device))
 print_cmd(cmd)
 sp.call(cmd, shell=True)
- if legacy_nmcli():
- cmd = ("nmcli -m tabular -t -f GENERAL d list | "
- "grep {} | awk -F: '{{print $15}}'".format(args.device))
- else:
- cmd = "nmcli -m tabular -t -f GENERAL.STATE d show {}".format(
- args.device)
+ cmd = "nmcli -m tabular -t -f GENERAL.STATE d show {}".format(
+ args.device)
 print_cmd(cmd)
 output = sp.check_output(cmd, shell=True)
 state = output.decode(sys.stdout.encoding).strip()
@@ -248,8 +207,7 @@ if __name__ == '__main__':
 start_time = datetime.datetime.now()
 
 cleanup_nm_connections()
- if not legacy_nmcli():
- device_rescan()
+ device_rescan()
 count = list_aps(args)
 
 if args.test_type == 'scan':