didericis/bot-bottle
1
0
Fork 0
Code Issues 33 Pull Requests 8 Actions 2 Packages Releases Wiki Activity

refactor(orchestrator): rename in-guest core Orchestrator -> OrchestratorCore

Browse Source 
Free the `Orchestrator` name for the incoming host-side control-plane service
ABC (parallel to `Gateway`). The in-guest control-plane core (registry + broker,
in orchestrator/service.py) becomes `OrchestratorCore`; server.py, __main__.py,
the lazy facade, and the two service/server tests updated.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
didericis
2026-07-25 14:29:32 -04:00
parent 07c975636d
commit 57d32d2c5c
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/test_orchestrator_server.py
+5 -5
View File
@@ -23,7 +23,7 @@ from bot_bottle.orchestrator_auth import ROLE_CLI, ROLE_GATEWAY, mint
from bot_bottle.orchestrator.broker import StubBroker
from bot_bottle.orchestrator.server import dispatch, make_server
from bot_bottle.orchestrator.store.registry_store import BottleRecord, RegistryStore
from bot_bottle.orchestrator.service import Orchestrator
from bot_bottle.orchestrator.service import OrchestratorCore
from bot_bottle.orchestrator.store.store_manager import StoreManager
from bot_bottle.orchestrator.supervisor import (
Proposal,
@@ -36,11 +36,11 @@ def _body(obj: object) -> bytes:
return json.dumps(obj).encode()
def _orchestrator(db_path: Path) -> Orchestrator:
def _orchestrator(db_path: Path) -> OrchestratorCore:
store = RegistryStore(db_path)
store.migrate()
secret = secrets.token_bytes(16)
return Orchestrator(store, StubBroker(secret), secret)
return OrchestratorCore(store, StubBroker(secret), secret)
class TestDispatch(unittest.TestCase):
@@ -408,7 +408,7 @@ class TestDispatchSupervise(unittest.TestCase):
self.store.migrate()
StoreManager(db).migrate()
secret = secrets.token_bytes(16)
self.orch = Orchestrator(self.store, StubBroker(secret), secret)
self.orch = OrchestratorCore(self.store, StubBroker(secret), secret)
def tearDown(self) -> None:
self._env.stop()
@@ -475,7 +475,7 @@ class TestDispatchSuperviseAgentRpc(unittest.TestCase):
self.store.migrate()
StoreManager(db).migrate()
secret = secrets.token_bytes(16)
self.orch = Orchestrator(self.store, StubBroker(secret), secret)
self.orch = OrchestratorCore(self.store, StubBroker(secret), secret)
def tearDown(self) -> None:
self._env.stop()
tests/unit/test_orchestrator_service.py
+6 -6
View File
@@ -1,4 +1,4 @@
"""Unit tests for the Orchestrator launch lifecycle (PRD 0070)."""
"""Unit tests for the OrchestratorCore launch lifecycle (PRD 0070)."""
from __future__ import annotations
@@ -13,7 +13,7 @@ from unittest.mock import patch
from bot_bottle.orchestrator.broker import LaunchBroker, LaunchRequest, StubBroker
from bot_bottle.orchestrator.store.registry_store import RegistryStore
from bot_bottle.orchestrator.service import Orchestrator
from bot_bottle.orchestrator.service import OrchestratorCore
from bot_bottle.orchestrator.store.secret_store import new_env_var_secret
from bot_bottle.orchestrator.store.store_manager import StoreManager
from bot_bottle.orchestrator.supervisor import (
@@ -42,7 +42,7 @@ class TestOrchestrator(unittest.TestCase):
self.store = RegistryStore(Path(self._tmp.name) / "r.db")
self.store.migrate()
self.broker = StubBroker(self.secret)
self.orch = Orchestrator(self.store, self.broker, self.secret)
self.orch = OrchestratorCore(self.store, self.broker, self.secret)
def tearDown(self) -> None:
self._tmp.cleanup()
@@ -137,7 +137,7 @@ class TestOrchestrator(unittest.TestCase):
self.assertIsNone(self.orch.resolve("10.243.0.3", "wrong-token"))
def test_launch_rolls_back_registry_on_broker_failure(self) -> None:
orch = Orchestrator(self.store, _FailingBroker(self.secret), self.secret)
orch = OrchestratorCore(self.store, _FailingBroker(self.secret), self.secret)
with self.assertRaises(RuntimeError):
orch.launch_bottle("10.243.0.9")
self.assertEqual([], self.store.all()) # no orphan
@@ -168,7 +168,7 @@ class TestOrchestratorSupervise(unittest.TestCase):
self.store.migrate()
StoreManager(db).migrate()
secret = secrets.token_bytes(16)
self.orch = Orchestrator(self.store, StubBroker(secret), secret)
self.orch = OrchestratorCore(self.store, StubBroker(secret), secret)
def tearDown(self) -> None:
self._env.stop()
@@ -360,7 +360,7 @@ class TestOrchestratorReconcile(unittest.TestCase):
self.store = RegistryStore(self.db)
self.store.migrate()
self.broker = StubBroker(self.secret)
self.orch = Orchestrator(self.store, self.broker, self.secret)
self.orch = OrchestratorCore(self.store, self.broker, self.secret)
def tearDown(self) -> None:
self._tmp.cleanup()