diff --git a/krkn/scenario_plugins/native/native_scenario_plugin.py b/krkn/scenario_plugins/native/native_scenario_plugin.py index d4e9502e..dc2ca6ef 100644 --- a/krkn/scenario_plugins/native/native_scenario_plugin.py +++ b/krkn/scenario_plugins/native/native_scenario_plugin.py @@ -49,6 +49,7 @@ class NativeScenarioPlugin(AbstractScenarioPlugin): return [ "pod_disruption_scenarios", "pod_network_scenarios", + "ingress_node_scenarios" ] def start_monitoring(self, pool: PodsMonitorPool, scenarios: list[Any]): diff --git a/krkn/scenario_plugins/native/network/ingress_shaping.py b/krkn/scenario_plugins/native/network/ingress_shaping.py index 2aa9d84f..79ece105 100644 --- a/krkn/scenario_plugins/native/network/ingress_shaping.py +++ b/krkn/scenario_plugins/native/network/ingress_shaping.py @@ -97,15 +97,6 @@ class NetworkScenarioConfig: }, ) - kraken_config: typing.Optional[str] = field( - default="", - metadata={ - "name": "Kraken Config", - "description": "Path to the config file of Kraken. " - "Set this field if you wish to publish status onto Cerberus", - }, - ) - @dataclass class NetworkScenarioSuccessOutput: @@ -710,6 +701,7 @@ def network_chaos( pod_module_template = env.get_template("pod_module.j2") cli, batch_cli = kube_helper.setup_kubernetes(cfg.kubeconfig_path) + logging.info("Starting Ingress Network Chaos") try: node_interface_dict = get_node_interfaces( cfg.node_interface_name, @@ -721,16 +713,6 @@ def network_chaos( except Exception: return "error", NetworkScenarioErrorOutput(format_exc()) job_list = [] - publish = False - if cfg.kraken_config: - failed_post_scenarios = "" - try: - with open(cfg.kraken_config, "r") as f: - config = yaml.full_load(f) - except Exception: - logging.error("Error reading Kraken config from %s" % cfg.kraken_config) - return "error", NetworkScenarioErrorOutput(format_exc()) - publish = True try: if cfg.execution_type == "parallel": @@ -747,13 +729,7 @@ def network_chaos( ) ) logging.info("Waiting for parallel job to finish") - start_time = int(time.time()) wait_for_job(batch_cli, job_list[:], cfg.test_duration + 100) - end_time = int(time.time()) - if publish: - cerberus.publish_kraken_status( - config, failed_post_scenarios, start_time, end_time - ) elif cfg.execution_type == "serial": create_interfaces = True @@ -773,18 +749,12 @@ def network_chaos( ) ) logging.info("Waiting for serial job to finish") - start_time = int(time.time()) wait_for_job(batch_cli, job_list[:], cfg.test_duration + 100) logging.info("Deleting jobs") delete_jobs(cli, batch_cli, job_list[:]) job_list = [] logging.info("Waiting for wait_duration : %ss" % cfg.wait_duration) time.sleep(cfg.wait_duration) - end_time = int(time.time()) - if publish: - cerberus.publish_kraken_status( - config, failed_post_scenarios, start_time, end_time - ) create_interfaces = False else: @@ -799,7 +769,7 @@ def network_chaos( execution_type=cfg.execution_type, ) except Exception as e: - logging.error("Network Chaos exiting due to Exception - %s" % e) + logging.error("Ingress Network Chaos exiting due to Exception - %s" % e) return "error", NetworkScenarioErrorOutput(format_exc()) finally: delete_virtual_interfaces(cli, node_interface_dict.keys(), pod_module_template)