rename "reboot" controller/endpoint to "shutdown"

po/POTFILES.in

@@ -42,6 +42,7 @@ subiquity/common/filesystem/tests/test_actions.py
 subiquity/common/filesystem/tests/test_labels.py
 subiquity/common/filesystem/tests/test_manipulator.py
 subiquity/common/__init__.py
+subiquity/common/resources.py
 subiquity/common/serialize.py
 subiquity/common/tests/__init__.py
 subiquity/common/tests/test_serialization.py
@@ -72,8 +73,11 @@ subiquitycore/ssh.py
 subiquitycore/testing/__init__.py
 subiquitycore/testing/view_helpers.py
 subiquitycore/tests/__init__.py
+subiquitycore/tests/mocks.py
 subiquitycore/tests/test_netplan.py
+subiquitycore/tests/test_pubsub.py
 subiquitycore/tests/test_view.py
+subiquitycore/tests/util.py
 subiquitycore/tuicontroller.py
 subiquitycore/tui.py
 subiquitycore/ui/actionmenu.py
@@ -120,6 +124,7 @@ subiquity/models/tests/__init__.py
 subiquity/models/tests/test_filesystem.py
 subiquity/models/tests/test_mirror.py
 subiquity/models/tests/test_subiquity.py
+subiquity/models/timezone.py
 subiquity/models/updates.py
 subiquity/server/controller.py
 subiquity/server/controllers/cmdlist.py
@@ -135,21 +140,26 @@ subiquity/server/controllers/mirror.py
 subiquity/server/controllers/network.py
 subiquity/server/controllers/package.py
 subiquity/server/controllers/proxy.py
-subiquity/server/controllers/reboot.py
 subiquity/server/controllers/refresh.py
 subiquity/server/controllers/reporting.py
+subiquity/server/controllers/shutdown.py
 subiquity/server/controllers/snaplist.py
 subiquity/server/controllers/ssh.py
 subiquity/server/controllers/tests/test_keyboard.py
+subiquity/server/controllers/timezone.py
 subiquity/server/controllers/updates.py
 subiquity/server/controllers/userdata.py
 subiquity/server/controllers/zdev.py
 subiquity/server/dryrun.py
 subiquity/server/errors.py
+subiquity/server/geoip.py
 subiquity/server/__init__.py
 subiquity/server/server.py
+subiquity/server/tests/__init__.py
+subiquity/server/tests/test_geoip.py
 subiquity/tests/fakes.py
 subiquity/tests/__init__.py
+subiquity/tests/test_timezonecontroller.py
 subiquity/ui/frame.py
 subiquity/ui/__init__.py
 subiquity/ui/mount.py

subiquity/client/client.py

@@ -252,7 +252,7 @@ class SubiquityClient(TuiApplication):
         elif event['SUBIQUITY_EVENT_TYPE'] == 'finish':
             print('finish: ' + event["MESSAGE"])
             context_name = event.get('SUBIQUITY_CONTEXT_NAME', '')
-            if context_name == 'subiquity/Reboot/reboot':
+            if context_name == 'subiquity/Shutdown/shutdown':
                 self.exit()
 
     async def connect(self):

subiquity/client/controllers/progress.py

@@ -65,7 +65,7 @@ class ProgressController(SubiquityTuiController):
 
     async def send_reboot_and_wait(self):
         try:
-            await self.app.client.reboot.POST()
+            await self.app.client.shutdown.POST()
         except aiohttp.ClientError:
             pass
         self.app.exit()

subiquity/common/apidef.py

@@ -235,7 +235,7 @@ class API:
         def GET() -> TimeZoneInfo: ...
         def POST(tz: str): ...
 
-    class reboot:
+    class shutdown:
         def POST(): ...
 
 

subiquity/server/controllers/__init__.py

@@ -25,9 +25,9 @@ from .mirror import MirrorController
 from .network import NetworkController
 from .package import PackageController
 from .proxy import ProxyController
-from .reboot import RebootController
 from .refresh import RefreshController
 from .reporting import ReportingController
+from .shutdown import ShutdownController
 from .snaplist import SnapListController
 from .ssh import SSHController
 from .timezone import TimeZoneController
@@ -50,9 +50,9 @@ __all__ = [
     'NetworkController',
     'PackageController',
     'ProxyController',
-    'RebootController',
     'RefreshController',
     'ReportingController',
+    'ShutdownController',
     'SnapListController',
     'SSHController',
     'TimeZoneController',

subiquity/server/controllers/shutdown.py

@@ -29,19 +29,19 @@ from subiquity.server.controllers.install import ApplicationState
 log = logging.getLogger("subiquity.controllers.restart")
 
 
-class RebootController(SubiquityController):
+class ShutdownController(SubiquityController):
 
-    endpoint = API.reboot
+    endpoint = API.shutdown
 
     def __init__(self, app):
         super().__init__(app)
-        self.user_reboot_event = asyncio.Event()
+        self.user_shutdown_event = asyncio.Event()
-        self.rebooting_event = asyncio.Event()
+        self.shuttingdown_event = asyncio.Event()
 
     async def POST(self):
         self.app.controllers.Install.stop_uu()
-        self.user_reboot_event.set()
+        self.user_shutdown_event.set()
-        await self.rebooting_event.wait()
+        await self.shuttingdown_event.wait()
 
     def interactive(self):
         return self.app.interactive
@@ -55,10 +55,10 @@ class RebootController(SubiquityController):
         await self.app.controllers.Late.run_event.wait()
         await self.copy_logs_to_target()
         if self.app.interactive:
-            await self.user_reboot_event.wait()
+            await self.user_shutdown_event.wait()
-            self.reboot()
+            self.shutdown()
         elif self.app.state == ApplicationState.DONE:
-            self.reboot()
+            self.shutdown()
 
     @with_context()
     async def copy_logs_to_target(self, context):
@@ -81,8 +81,8 @@ class RebootController(SubiquityController):
             log.exception("saving journal failed")
 
     @with_context()
-    def reboot(self, context):
+    def shutdown(self, context):
-        self.rebooting_event.set()
+        self.shuttingdown_event.set()
         if self.opts.dry_run:
             self.app.exit()
         else:

subiquity/server/server.py

@@ -222,7 +222,7 @@ class SubiquityServer(Application):
         "Install",
         "Updates",
         "Late",
-        "Reboot",
+        "Shutdown",
         ]
 
     def make_model(self):