Fix two bugs for preflight check (#1267)

* Fix two bugs

* Update package_checker.py

Author: YuanTingHsieh

nvflare/tool/package_checker/package_checker.py

@@ -39,7 +39,7 @@ def init_rules(self, package_path: str):
     def init(self, package_path: str):
         if not os.path.exists(package_path):
             raise RuntimeError(f"Package path: {package_path} does not exist.")
-        self.package_path = package_path
+        self.package_path = os.path.abspath(package_path)
         self.init_rules(package_path)
 
     @abstractmethod
@@ -54,8 +54,8 @@ def get_dry_run_command(self) -> str:
     def stop_dry_run(self, force: bool = True):
         # todo: add gracefully shutdown command, currently
         print("killing dry run process")
-
-        cmd = f"pkill -9 -f '{self.package_path}'"
+        command = self.get_dry_run_command()
+        cmd = f"pkill -9 -f '{command}'"
         process = run_command_in_subprocess(cmd)
         process.wait()
 

nvflare/tool/package_checker/server_package_checker.py

@@ -54,19 +54,19 @@ def _get_job_storage_root(package_path: str) -> str:
     return job_storage_root
 
 
-def _get_grpc_host_and_port(package_path: str):
+def _get_grpc_host_and_port(package_path: str) -> (str, int):
     fed_config = _get_server_fed_config(package_path)
     server_conf = fed_config["servers"][0]
     grpc_service_config = server_conf["service"]
     grpc_target_address = grpc_service_config["target"]
-    host, port = grpc_target_address.split(":")
-    return host, int(port)
+    _, port = grpc_target_address.split(":")
+    return "localhost", int(port)
 
 
-def _get_admin_host_and_port(package_path: str):
+def _get_admin_host_and_port(package_path: str) -> (str, int):
     fed_config = _get_server_fed_config(package_path)
     server_conf = fed_config["servers"][0]
-    return server_conf["admin_host"], int(server_conf["admin_port"])
+    return "localhost", int(server_conf["admin_port"])
 
 
 class ServerPackageChecker(PackageChecker):
@@ -103,8 +103,8 @@ def get_dry_run_command(self) -> str:
         self.job_storage_root = _get_job_storage_root(self.package_path)
         return command
 
-    def stop_dry_run(self):
-        super().stop_dry_run()
+    def stop_dry_run(self, force=True):
+        super().stop_dry_run(force=force)
         if os.path.exists(self.snapshot_storage_root):
             shutil.rmtree(self.snapshot_storage_root)
         if os.path.exists(self.job_storage_root):