refactor: make user network mode available already in shell state

honeytreelabs · Jan 1, 2025 · 2daf33e · 2daf33e
1 parent 7b30e7a
commit 2daf33e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/util/strategy/qemu_network.py b/util/strategy/qemu_network.py
@@ -163,16 +163,17 @@ def transition(self, state: Status | str, *, step: Step) -> None:
             self.qemu.on()
             self.target.activate(self.qemu)
             self.target.activate(self.shell)
-            assert self.shell
-
-        elif state == Status.ssh:
-            self.transition(Status.shell)
 
             assert self.shell
             if uci.get(self.shell, "network.lan.proto") != "dhcp":
                 uci.set(self.shell, "network.lan.proto", "dhcp")
                 uci.commit(self.shell, "network")
                 service.restart(self.shell, "network", wait=1)
+
+        elif state == Status.ssh:
+            self.transition(Status.shell)
+
+            assert self.shell
             self.update_network_service()
 
         self.status = state
diff --git a/util/strategy/qemu_stateful.py b/util/strategy/qemu_stateful.py
@@ -83,16 +83,17 @@ def transition(self, state: Status | str, *, step: Step) -> None:
             # check if target is running
             self.target.activate(self.qemu)
             self.target.activate(self.shell)
-            assert self.shell
-
-        elif state == Status.ssh:
-            self.transition(Status.shell)
 
             assert self.shell
             if uci.get(self.shell, "network.lan.proto") != "dhcp":
                 uci.set(self.shell, "network.lan.proto", "dhcp")
                 uci.commit(self.shell, "network")
                 service.restart(self.shell, "network", wait=1)
+
+        elif state == Status.ssh:
+            self.transition(Status.shell)
+
+            assert self.shell
             self.update_network_service()
         else:
             raise StrategyError(f"no transition found from {self.status} to {status}")