changing to filter to better align with functionality

Author: paigerube14

krkn/scenario_plugins/network_chaos_ng/modules/node_interface_down.py

@@ -11,6 +11,7 @@
 # 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 queue
 import time
 from typing import Tuple
@@ -97,16 +98,13 @@ def run(self, target: str, error_queue: queue.Queue = None):
             # to the control plane, so exec_cmd_in_pod can no longer reach the pod.
             # The background process runs entirely on the node and fires regardless of
             # control-plane connectivity.
-            # The recovery process runs with all stdio redirected to /dev/null so it does
-            # not hold the exec session's file descriptors open, allowing exec to return
-            # immediately after down_cmds completes.
             recovery_cmds = " && ".join(
                 [f"ip link set {iface} up" for iface in interfaces]
             )
             down_cmds = " && ".join(
                 [f"ip link set {iface} down" for iface in interfaces]
             )
-            cmd = f"sh -c 'sleep {self.config.test_duration} && {recovery_cmds}' </dev/null >/dev/null 2>&1 & {down_cmds}"
+            cmd = f"(sleep {self.config.test_duration} && {recovery_cmds}) & {down_cmds}"
             self.kubecli.get_lib_kubernetes().exec_cmd_in_pod(
                 [cmd], pod_name, self.config.namespace
             )
@@ -117,6 +115,13 @@ def run(self, target: str, error_queue: queue.Queue = None):
                 target,
             )
 
+            log_info(
+                f"waiting {self.config.test_duration} seconds for interface(s) to recover",
+                parallel,
+                target,
+            )
+            time.sleep(self.config.test_duration)
+
             log_info(
                 f"waiting for node {target} to become Ready after interface recovery",
                 parallel,

…rk_chaos_ng/modules/vmi_network_chaos.py …k_chaos_ng/modules/vmi_network_filter.pykrkn/scenario_plugins/network_chaos_ng/modules/vmi_network_chaos.py renamed to krkn/scenario_plugins/network_chaos_ng/modules/vmi_network_filter.py krkn/scenario_plugins/network_chaos_ng/modules/vmi_network_chaos.py renamed to krkn/scenario_plugins/network_chaos_ng/modules/vmi_network_filter.py

@@ -41,7 +41,7 @@
 )
 
 
-class VmiNetworkChaosModule(AbstractNetworkChaosModule):
+class VmiNetworkFilterModule(AbstractNetworkChaosModule):
 
     def __init__(self, config: NetworkFilterConfig, kubecli: KrknTelemetryOpenshift):
         super().__init__(config, kubecli)

krkn/scenario_plugins/network_chaos_ng/network_chaos_factory.py

@@ -36,8 +36,8 @@
 from krkn.scenario_plugins.network_chaos_ng.modules.pod_network_filter import (
     PodNetworkFilterModule,
 )
-from krkn.scenario_plugins.network_chaos_ng.modules.vmi_network_chaos import (
-    VmiNetworkChaosModule,
+from krkn.scenario_plugins.network_chaos_ng.modules.vmi_network_filter import (
+    VmiNetworkFilterModule,
 )
 
 supported_modules = [
@@ -46,7 +46,7 @@
     "pod_network_chaos",
     "node_network_chaos",
     "node_interface_down",
-    "vmi_network_chaos",
+    "vmi_network_filter",
 ]
 
 
@@ -91,11 +91,11 @@ def get_instance(
             if len(errors) > 0:
                 raise Exception(f"config validation errors: [{';'.join(errors)}]")
             return NodeInterfaceDownModule(scenario_config, kubecli)
-        if config["id"] == "vmi_network_chaos":
+        if config["id"] == "vmi_network_filter":
             scenario_config = NetworkFilterConfig(**config)
             errors = scenario_config.validate()
             if len(errors) > 0:
                 raise Exception(f"config validation errors: [{';'.join(errors)}]")
-            return VmiNetworkChaosModule(scenario_config, kubecli)
+            return VmiNetworkFilterModule(scenario_config, kubecli)
         else:
             raise Exception(f"invalid network chaos id {config['id']}")

scenarios/openshift/virt_network.yaml

@@ -1,4 +1,4 @@
-- id: vmi_network_chaos
+- id: vmi_network_filter
   image: "quay.io/krkn-chaos/krkn-network-chaos:latest"
   wait_duration: 300
   test_duration: 120