Oper/Cli: Add operational data for accesspoint status

Author: mattiaswal

src/statd/python/cli_pretty/cli_pretty.py

@@ -87,6 +87,10 @@ class PadWifiScan:
     encryption = 30
     signal = 9
 
+class PadWifiStations:
+    mac = 20
+    signal = 9
+
 
 class PadLldp:
     interface = 16
@@ -651,13 +655,30 @@ def pr_proto_loopack(self, pipe=''):
         row = self._pr_proto_common("loopback", False, pipe);
         print(row)
 
+    def pr_wifi_stations(self):
+        hdr = "\nCONNECTED STATIONS"
+        print(Decore.invert(hdr))
+        hdr =  (f"{'MAC':<{PadWifiStations.mac}}"
+                f"{'SIGNAL':<{PadWifiStations.signal}}"
+                )
+        print(Decore.invert(hdr))
+
+        stations=self.wifi.get("connected-stations", {})
+        for station in stations:
+            status=rssi_to_status(station["rssi"])
+            row = f"{station['mac']:<{PadWifiStations.mac}}"
+            row += f"{status:<{PadWifiStations.signal}}"
+            print(row)
+
     def pr_wifi_ssids(self):
+        hdr = "\nSCAN RESULTS"
+        print(Decore.invert(hdr))
         hdr =  (f"{'SSID':<{PadWifiScan.ssid}}"
                 f"{'ENCRYPTION':<{PadWifiScan.encryption}}"
                 f"{'SIGNAL':<{PadWifiScan.signal}}"
                 )
-
         print(Decore.invert(hdr))
+
         results=self.wifi.get("scan-results", {})
         for result in results:
             encstr = ",".join(result["encryption"])
@@ -676,14 +697,16 @@ def pr_proto_wifi(self, pipe=''):
         rssi = None
         status_str=""
         if self.wifi:
-            rssi=self.wifi.get("active-rssi")
-            ssid=self.wifi.get("active-ssid")
-        else:
-            signal=rssi_to_status(rssi)
-
-        if ssid is not None:
-            status_str = f"ssid: {ssid}, signal: {signal}"
-
+            if self.wifi.get("mode", "") == "client":
+                ssid=self.wifi.get("active-ssid")
+                if ssid is not None:
+                    rssi=self.wifi.get("active-rssi")
+                    signal=rssi_to_status(rssi)
+
+                    status_str = f"ssid: {ssid}, signal: {signal}"
+            elif self.wifi.get("mode", "") == "accesspoint":
+                stations=self.wifi.get("connected-stations", {})
+                status_str = f"Connected stations: {len(stations)}"
         row =  f"{'':<{Pad.iface}}"
         row += f"{'wifi':<{Pad.proto}}"
         row += f"{'':<{Pad.state}}{status_str}"
@@ -944,15 +967,6 @@ def pr_iface(self):
         else:
                 print(f"{'ipv6 addresses':<{20}}:")
 
-        if self.wifi:
-            ssid=self.wifi.get('active-ssid')
-            rssi=self.wifi.get('active-rssi')
-            if ssid is not None:
-                print(f"{'SSID':<{20}}: {ssid}")
-                print(f"{'Signal':<{20}}: {rssi}")
-                print("")
-            self.pr_wifi_ssids()
-
         if self.gre:
             print(f"{'local address':<{20}}: {self.gre['local']}")
             print(f"{'remote address':<{20}}: {self.gre['remote']}")
@@ -973,6 +987,18 @@ def pr_iface(self):
             for key, val in frame.items():
                 key = remove_yang_prefix(key)
                 print(f"eth-{key:<{25}}: {val}")
+        if self.wifi:
+            ssid=self.wifi.get('active-ssid', "")
+            rssi=self.wifi.get('active-rssi', "")
+            mode=self.wifi.get('mode')
+            if mode == "client":
+                print(f"{'SSID':<{20}}: {ssid}")
+                print(f"{'Signal':<{20}}: {rssi}")
+                print("")
+                self.pr_wifi_ssids()
+            if mode == "accesspoint":
+                self.pr_wifi_stations()
+
 
     def pr_mdb(self, bridge):
         for group in self.br_mdb.get("multicast-filter", {}):

src/statd/python/yanger/ietf_interfaces/wifi.py

@@ -3,28 +3,54 @@
 import re
 
 def wifi(ifname):
-    data=HOST.run(tuple(f"wpa_cli -i {ifname} status".split()), default="")
+    iw_data=HOST.run(tuple(f"iw dev {ifname} info".split()), default="")
     wifi_data={}
 
-    if data != "":
-        for line in data.splitlines():
-            k,v = line.split("=")
-            if k == "ssid":
-                wifi_data["active-ssid"] = v
-
-        data=HOST.run(tuple(f"wpa_cli -i {ifname} signal_poll".split()), default="FAIL")
-
-        # signal_poll return FAIL not connected
-        if data.strip() != "FAIL":
-            for line in data.splitlines():
-                k,v = line.strip().split("=")
-                if k == "RSSI":
-                    wifi_data["active-rssi"]=int(v)
-    data=HOST.run(tuple(f"wpa_cli -i {ifname} scan_result".split()), default="FAIL")
-
-    if data != "FAIL":
-        wifi_data["scan-results"] = parse_wpa_scan_result(data)
-
+    if iw_data != "":
+        for line in iw_data.splitlines():
+            line=line.strip() # Fix crazy output from iw.
+            l=line.split(" ")
+            if l[0] == "type":
+                if l[1] == "AP":
+                    wifi_data["mode"] = "accesspoint"
+                else:
+                    wifi_data["mode"] = "client"
+
+        if wifi_data["mode"] == "client":
+            client_data=HOST.run(tuple(f"wpa_cli -i {ifname} status".split()), default="")
+            if client_data != "":
+                for line in client_data.splitlines():
+                    k,v = line.split("=")
+                    if k == "ssid":
+                        wifi_data["active-ssid"] = v
+
+                data=HOST.run(tuple(f"wpa_cli -i {ifname} signal_poll".split()), default="FAIL")
+
+                # signal_poll return FAIL not connected
+                if data.strip() != "FAIL":
+                    for line in data.splitlines():
+                        k,v = line.strip().split("=")
+                        if k == "RSSI":
+                            wifi_data["active-rssi"]=int(v)
+                data=HOST.run(tuple(f"wpa_cli -i {ifname} scan_result".split()), default="FAIL")
+                if data != "FAIL":
+                    wifi_data["scan-results"] = parse_wpa_scan_result(data)
+        elif wifi_data["mode"] == "accesspoint":
+            ap_data=HOST.run(tuple(f"hostapd_cli  -i {ifname} list_sta".split()), default="")
+            if ap_data != "":
+                stations=[]
+                for mac in ap_data.splitlines():
+                    station = {}
+                    status=HOST.run(tuple(f"hostapd_cli  -i {ifname} sta {mac}".split()), default="")
+                    if status != "":
+                        for line in status.splitlines()[1:]:
+                            k,v = line.split("=")
+                            if k == "signal":
+                                station["rssi"] = int(v)
+                        station["mac"] = mac
+                        stations.append(station)
+
+                wifi_data["connected-stations"] = stations
     return wifi_data