Add Simulator SP Aux message support

nvflare/private/fed/simulator/simulator_server.py

@@ -11,13 +11,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+import os
 from typing import Dict, List, Optional
 
 from nvflare.apis.fl_component import FLComponent
-from nvflare.apis.fl_constant import FLContextKey, ReservedKey, ReservedTopic, ServerCommandKey
+from nvflare.apis.fl_constant import FLContextKey, ReservedKey, ReservedTopic, ServerCommandKey, SiteType
 from nvflare.apis.fl_context import FLContext
 from nvflare.apis.shareable import ReturnCode, Shareable, make_reply
+from nvflare.apis.workspace import Workspace
 from nvflare.fuel.f3.message import Message
 from nvflare.private.fed.server.run_manager import RunManager
 from nvflare.private.fed.server.server_state import HotState
@@ -144,6 +145,20 @@ def _create_server_engine(self, args, snapshot_persistor):
 
     def deploy(self, args, grpc_args=None, secure_train=False):
         super(FederatedServer, self).deploy(args, grpc_args, secure_train)
+        os.makedirs(os.path.join(args.workspace, "local"), exist_ok=True)
+        os.makedirs(os.path.join(args.workspace, "startup"), exist_ok=True)
+        workspace = Workspace(args.workspace, "server", args.config_folder)
+        run_manager = RunManager(
+            server_name=SiteType.SERVER,
+            engine=self.engine,
+            job_id="",
+            workspace=workspace,
+            components={},
+            handlers=[],
+        )
+        self.engine.set_run_manager(run_manager)
+        self.engine.initialize_comm(self.cell)
+
         self._register_cellnet_cbs()
 
     def stop_training(self):

tests/unit_test/private/fed/app/deployer/simulator_deployer_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import argparse
+import os
 import shutil
 import tempfile
 import unittest
@@ -26,6 +27,7 @@
 from nvflare.private.fed.app.deployer.simulator_deployer import SimulatorDeployer
 from nvflare.private.fed.app.simulator.simulator import define_simulator_parser
 from nvflare.private.fed.client.fed_client import FederatedClient
+from nvflare.private.fed.server.run_manager import RunManager
 
 # from nvflare.private.fed.simulator.simulator_server import SimulatorServer
 from nvflare.security.security import EmptyAuthorizer
@@ -71,3 +73,20 @@ def test_create_client(self, mock_register):
         assert isinstance(client, FederatedClient)
         client.cell.stop()
         shutil.rmtree(workspace)
+
+    @patch("nvflare.private.fed.server.admin.FedAdminServer.start")
+    @patch("nvflare.private.fed.simulator.simulator_server.SimulatorServer._register_cellnet_cbs")
+    def test_run_manager_creation(self, mock_admin, mock_simulator_server):
+        workspace = tempfile.mkdtemp()
+        os.mkdir(os.path.join(workspace, "local"))
+        os.mkdir(os.path.join(workspace, "startup"))
+        parser = self._create_parser()
+        args = parser.parse_args(["job_folder", "-w" + workspace, "-n 2", "-t 1"])
+        args.config_folder = "config"
+        simulator_server, self.server = self.deployer.create_fl_server(args)
+
+        assert isinstance(self.server.engine.run_manager, RunManager)
+
+        self.server.cell.stop()
+        self.server.close()
+        shutil.rmtree(workspace)