Merge pull request #965 from mwhudson/wlan-methods-api

add wlan-related methods to API

subiquity/client/controllers/network.py

@@ -26,6 +26,7 @@ from subiquitycore.models.network import (
     BondConfig,
     NetDevInfo,
     StaticConfig,
+    WLANConfig,
     )
 from subiquitycore.ui.views.network import NetworkView
 
@@ -132,6 +133,14 @@ class NetworkController(SubiquityTuiController, NetworkAnswersMixin):
         self.app.aio_loop.create_task(
             self.endpoint.vlan.PUT(dev_name, vlan_id))
 
+    def set_wlan(self, dev_name: str, wlan: WLANConfig) -> None:
+        self.app.aio_loop.create_task(
+            self.endpoint.set_wlan.POST(dev_name, wlan))
+
+    def start_scan(self, dev_name: str) -> None:
+        self.app.aio_loop.create_task(
+            self.endpoint.start_scan.POST(dev_name))
+
     def delete_link(self, dev_name: str):
         self.app.aio_loop.create_task(self.endpoint.delete.POST(dev_name))
 

subiquity/common/apidef.py

@@ -20,6 +20,7 @@ from subiquitycore.models.network import (
     BondConfig,
     NetDevInfo,
     StaticConfig,
+    WLANConfig,
     )
 
 from subiquity.common.api.defs import api, Payload, simple_endpoint
@@ -180,6 +181,12 @@ class API:
             def POST(existing_name: Optional[str], new_name: str,
                      bond_config: Payload[BondConfig]) -> None: ...
 
+        class start_scan:
+            def POST(dev_name: str) -> None: ...
+
+        class set_wlan:
+            def POST(dev_name: str, wlan: WLANConfig) -> None: ...
+
         class delete:
             def POST(dev_name: str) -> None: ...
 

subiquity/server/controllers/network.py

@@ -26,6 +26,7 @@ from subiquitycore.models.network import (
     BondConfig,
     NetDevInfo,
     StaticConfig,
+    WLANConfig,
     )
 
 from subiquity.common.api.client import make_client_for_conn
@@ -302,6 +303,12 @@ class NetworkController(BaseNetworkController, SubiquityController):
                                     bond_config: BondConfig) -> None:
         self.add_or_update_bond(existing_name, new_name, bond_config)
 
+    async def set_wlan_POST(self, dev_name: str, wlan: WLANConfig) -> None:
+        self.set_wlan(dev_name, wlan)
+
+    async def start_scan_POST(self, dev_name: str) -> None:
+        self.start_scan(dev_name)
+
     async def delete_POST(self, dev_name: str) -> None:
         self.delete_link(dev_name)