ibm changes

krkn-chaos · Oct 7, 2024 · 4cc36ff · 4cc36ff
1 parent c5322f7
commit 4cc36ff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/krkn/scenario_plugins/node_actions/ibm_node_scenarios.py b/krkn/scenario_plugins/node_actions/ibm_node_scenarios.py
@@ -2,10 +2,7 @@
 import sys
 import time
 from os import environ
-from traceback import format_exc
 import logging
-from arcaflow_plugin_sdk import plugin
-from kubernetes import client, watch
 from ibm_vpc import VpcV1
 from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
 import sys
@@ -245,7 +242,7 @@ def node_start(self, instance_kill_count, node, timeout):
                     "Starting the node %s with instance ID: %s " % (node, instance_id)
                 )
                 self.ibm.start_instances(instance_id)
-                self.ibm.wait_until_running(instance_id)
+                self.ibm.wait_until_running(instance_id,timeout)
                 nodeaction.wait_for_ready_status(node, timeout, self.kubecli)
                 logging.info(
                     "Node with instance ID: %s is in running state" % (instance_id)
@@ -270,7 +267,7 @@ def node_stop_scenario(self, instance_kill_count, node, timeout):
                     "Stopping the node %s with instance ID: %s " % (node, instance_id)
                 )
                 self.ibm.stop_instances(instance_id)
-                self.ibm.wait_until_stopped(instance_id)
+                self.ibm.wait_until_stopped(instance_id,timeout)
                 logging.info(
                     "Node with instance ID: %s is in stopped state" % (instance_id)
                 )
@@ -294,8 +291,8 @@ def node_termination_scenario(self, instance_kill_count, node, timeout):
                     "Terminating the node %s with instance ID: %s "
                     % (node, instance_id)
                 )
-                self.ibm.terminate_instances(instance_id)
-                self.ibm.wait_until_terminated(instance_id)
+                self.ibm.delete_instance(instance_id)
+                self.ibm.wait_until_released(instance_id, timeout)
                 for _ in range(timeout):
                     if node not in self.kubecli.list_nodes():
                         break
@@ -325,8 +322,7 @@ def node_reboot_scenario(self, instance_kill_count, node, timeout):
                     "Rebooting the node %s with instance ID: %s " % (node, instance_id)
                 )
                 self.ibm.reboot_instances(instance_id)
-                nodeaction.wait_for_unknown_status(node, timeout, self.kubecli)
-                nodeaction.wait_for_ready_status(node, timeout, self.kubecli)
+                self.ibm.wait_until_rebooted(instance_id,timeout)
                 logging.info(
                     "Node with instance ID: %s has been rebooted" % (instance_id)
                 )

diff --git a/krkn/scenario_plugins/node_actions/node_actions_scenario_plugin.py b/krkn/scenario_plugins/node_actions/node_actions_scenario_plugin.py
@@ -16,6 +16,7 @@
     docker_node_scenarios,
 )
 from krkn.scenario_plugins.node_actions.gcp_node_scenarios import gcp_node_scenarios
+from krkn.scenario_plugins.node_actions.ibm_node_scenarios import ibm_node_scenarios
 from krkn.scenario_plugins.node_actions.general_cloud_node_scenarios import (
     general_node_scenarios,
 )
@@ -64,31 +65,31 @@ def get_node_scenario_object(self, node_scenario, kubecli: KrknKubernetes):
             global node_general
             node_general = True
             return general_node_scenarios(kubecli)
-        if node_scenario["cloud_type"] == "aws":
+        if node_scenario["cloud_type"].lower() == "aws":
             return aws_node_scenarios(kubecli)
-        elif node_scenario["cloud_type"] == "gcp":
+        elif node_scenario["cloud_type"].lower() == "gcp":
             return gcp_node_scenarios(kubecli)
-        elif node_scenario["cloud_type"] == "openstack":
+        elif node_scenario["cloud_type"].lower() == "openstack":
             from krkn.scenario_plugins.node_actions.openstack_node_scenarios import (
                 openstack_node_scenarios,
             )
 
             return openstack_node_scenarios(kubecli)
         elif (
-            node_scenario["cloud_type"] == "azure"
+            node_scenario["cloud_type"].lower() == "azure"
             or node_scenario["cloud_type"] == "az"
         ):
             return azure_node_scenarios(kubecli)
         elif (
-            node_scenario["cloud_type"] == "alibaba"
+            node_scenario["cloud_type"].lower() == "alibaba"
             or node_scenario["cloud_type"] == "alicloud"
         ):
             from krkn.scenario_plugins.node_actions.alibaba_node_scenarios import (
                 alibaba_node_scenarios,
             )
 
             return alibaba_node_scenarios(kubecli)
-        elif node_scenario["cloud_type"] == "bm":
+        elif node_scenario["cloud_type"].lower() == "bm":
             from krkn.scenario_plugins.node_actions.bm_node_scenarios import (
                 bm_node_scenarios,
             )
@@ -99,8 +100,10 @@ def get_node_scenario_object(self, node_scenario, kubecli: KrknKubernetes):
                 node_scenario.get("bmc_password", None),
                 kubecli,
             )
-        elif node_scenario["cloud_type"] == "docker":
+        elif node_scenario["cloud_type"].lower() == "docker":
             return docker_node_scenarios(kubecli)
+        elif node_scenario['cloud_type'].lower() in ["ibm","ibmcloud"]: 
+            return ibm_node_scenarios(kubecli)
         else:
             logging.error(
                 "Cloud type "