Refactoring code due to the deletion of configure_cluster() in kind c…

…lass(not pass pylint)
xlab-uiuc · Feb 1, 2024 · 8e00049 · 8e00049
1 parent 2ff5690
commit 8e00049
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/acto/engine.py b/acto/engine.py
@@ -1,5 +1,6 @@
 """The main engine of Acto. It is responsible for running the test cases and
 collecting the results."""
+
 import importlib
 import json
 import os
@@ -784,6 +785,8 @@ def __init__(
             cluster = kind.Kind(
                 acto_namespace=acto_namespace,
                 feature_gates=operator_config.kubernetes_engine.feature_gates,
+                num_nodes=operator_config.num_nodes,
+                version=operator_config.kubernetes_version,
             )
         else:
             logger.warning(
@@ -793,6 +796,8 @@ def __init__(
             cluster = kind.Kind(
                 acto_namespace=acto_namespace,
                 feature_gates=operator_config.kubernetes_engine.feature_gates,
+                num_nodes=operator_config.num_nodes,
+                version=operator_config.kubernetes_version,
             )
 
         self.cluster = cluster
@@ -810,11 +815,6 @@ def __init__(
         self.runner_type = Runner
         self.checker_type = CheckerSet
 
-        # generate configuration files for the cluster runtime
-        self.cluster.configure_cluster(
-            operator_config.num_nodes, self.operator_config.kubernetes_version
-        )
-
         self.__learn(
             context_file=context_file,
             helper_crd=helper_crd,

diff --git a/acto/post_process/post_diff_test.py b/acto/post_process/post_diff_test.py
@@ -65,9 +65,7 @@ def from_file(cls, file_path: str) -> "DiffTestResult":
     def to_file(self, file_path: str):
         """Dump the DiffTestResult to a file"""
         with open(file_path, "w", encoding="utf-8") as f:
-            json.dump(
-                self.model_dump(), f, cls=ActoEncoder, indent=4
-            )
+            json.dump(self.model_dump(), f, cls=ActoEncoder, indent=4)
 
 
 def dict_hash(d: dict) -> int:
@@ -571,9 +569,8 @@ def post_process(self, workdir: str, num_workers: int = 1):
         cluster = kind.Kind(
             acto_namespace=self.acto_namespace,
             feature_gates=self.config.kubernetes_engine.feature_gates,
-        )
-        cluster.configure_cluster(
-            self.config.num_nodes, self.config.kubernetes_version
+            num_nodes=self.config.num_nodes,
+            version=self.config.kubernetes_version,
         )
         deploy = Deploy(self.config.deploy)
         # Build an archive to be preloaded
@@ -648,9 +645,8 @@ def check_diff_test_result(
         cluster = kind.Kind(
             acto_namespace=self.acto_namespace,
             feature_gates=self.config.kubernetes_engine.feature_gates,
-        )
-        cluster.configure_cluster(
-            self.config.num_nodes, self.config.kubernetes_version
+            num_nodes=self.config.num_nodes,
+            version=self.config.kubernetes_version,
         )
 
         deploy = Deploy(self.config.deploy)

diff --git a/acto/post_process/simple_crash_test.py b/acto/post_process/simple_crash_test.py
@@ -1,4 +1,5 @@
 """Temporary code, do not use"""
+
 import glob
 import json
 import logging
@@ -265,9 +266,8 @@ def post_process(self, workdir: str, num_workers: int = 1):
             acto_namespace=self.acto_namespace,
             posthooks=[posthook],
             feature_gates=self.config.kubernetes_engine.feature_gates,
-        )
-        cluster.configure_cluster(
-            self.config.num_nodes, self.config.kubernetes_version
+            num_nodes=self.config.num_nodes,
+            version=self.config.kubernetes_version,
         )
         deploy = Deploy(self.config.deploy)