Merge pull request #48 from ushiboy/develop

Develop

Author: ushiboy

README.md

@@ -232,7 +232,7 @@ nmcli.device.delete(ifname: str) -> None
 List available Wi-Fi access points.
 
 ```
-nmcli.device.wifi() -> List[DeviceWifi]
+nmcli.device.wifi(ifname: str = None) -> List[DeviceWifi]
 ```
 
 #### nmcli.device.wifi_connect
@@ -437,6 +437,10 @@ nmcli.set_lang(lang: str) -> None
 
 ## Change Log
 
+### 0.9.0
+
+Added ifname param to wifi.
+
 ### 0.8.0
 
 Added support for changing the LANG environment variable.

nmcli/_device.py

@@ -133,7 +133,7 @@ def delete(self, ifname: str) -> None:
 
     def wifi(self, ifname: str = None) -> List[DeviceWifi]:
         cmd = ['-t', '-f', 'IN-USE,SSID,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,SECURITY',
-              'device', 'wifi', 'list']
+               'device', 'wifi', 'list']
         if ifname is not None:
             cmd += ['ifname', ifname]
         r = self._syscmd.nmcli(cmd)

nmcli/dummy/_device.py

@@ -27,6 +27,10 @@ def reapply_args(self):
     def delete_args(self):
         return self._delete_args
 
+    @property
+    def wifi_args(self):
+        return self._wifi_args
+
     @property
     def wifi_connect_args(self):
         return self._wifi_connect_args
@@ -57,6 +61,7 @@ def __init__(self,
         self._disconnect_args: List[str] = []
         self._reapply_args: List[str] = []
         self._delete_args: List[str] = []
+        self._wifi_args: List[str] = []
         self._wifi_connect_args: List[Tuple] = []
         self._wifi_hotspot_args: List[Tuple] = []
         self._wifi_rescan_args: List[Tuple] = []
@@ -96,8 +101,10 @@ def delete(self, ifname: str) -> None:
         self._raise_error_if_needed()
         self._delete_args.append(ifname)
 
-    def wifi(self) -> List[DeviceWifi]:
+    def wifi(self, ifname: str = None) -> List[DeviceWifi]:
         self._raise_error_if_needed()
+        if ifname is not None:
+            self._wifi_args.append(ifname)
         return self._result_wifi
 
     def wifi_connect(self, ssid: str, password: str, ifname: str = None) -> None:

setup.py

@@ -13,7 +13,7 @@ def run_tests(self):
 
 setup(
     name='nmcli',
-    version='0.8.0',
+    version='0.9.0',
     author='ushiboy',
     license='MIT',
     description='A python wrapper library for the network-manager cli client',

tests/dummy/test_device.py

@@ -116,6 +116,9 @@ def test_wifi():
     result_wifi = [DeviceWifi(False, 'ssid', '00:00:00:00:00:00', 'Infra', 1, 2400, 54, 78, 'WPA2')]
     c = DummyDeviceControl(result_wifi=result_wifi)
     assert c.wifi() == result_wifi
+    ifname = 'wlan0'
+    assert c.wifi(ifname) == result_wifi
+    assert c.wifi_args == [ifname]
 
 
 def test_wifi_when_raise_error():

tests/test_device.py

@@ -165,23 +165,27 @@ def test_device_wifi():
     r = device.wifi()
     assert len(r) == 3
     assert r == [
-            DeviceWifi(True, 'AP1', '00:00:00:00:00:00', 'Infra', 1, 2400, 130, 82, 'WPA1 WPA2'),
+        DeviceWifi(True, 'AP1', '00:00:00:00:00:00', 'Infra', 1, 2400, 130, 82, 'WPA1 WPA2'),
         DeviceWifi(False, 'AP2', '00:00:00:00:00:01', 'Infra', 11, 2401, 195, 74, 'WPA2'),
         DeviceWifi(False, 'AP3', '00:00:00:00:00:02',  'Infra', 11, 2402, 195, 72, 'WPA1 WPA2'),
     ]
     assert s.passed_parameters == ['-t', '-f', 'IN-USE,SSID,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,SECURITY',
-                                   'device', 'wifi']
+                                   'device', 'wifi', 'list']
 
     with open(device_wifi_data_file) as f:
         buf = f.read()
-    device = DeviceControl(DummySystemCommand(buf))
-    r = device.wifi()
+    s2 = DummySystemCommand(buf)
+    device = DeviceControl(s2)
+    ifname = 'wlan0'
+    r = device.wifi(ifname)
     assert len(r) == 3
     assert r == [
         DeviceWifi(False, '', '00:00:00:00:00:00', 'Infra', 11, 2400, 195, 72, 'WPA1 WPA2'),
         DeviceWifi(False, 'AP1', '00:00:00:00:00:01', 'Infra', 4, 2401, 130, 40, 'WPA1 WPA2'),
         DeviceWifi(False, 'AP2', '00:00:00:00:00:02', 'Infra', 6, 2402, 65, 24, 'WPA2'),
     ]
+    assert s2.passed_parameters == ['-t', '-f', 'IN-USE,SSID,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,SECURITY',
+                                   'device', 'wifi', 'list', 'ifname', ifname]
 
 
 def test_wifi_connect():