Skip to content

Commit

Permalink
adding vsphere updates to non native
Browse files Browse the repository at this point in the history
Signed-off-by: Paige Patton <[email protected]>
  • Loading branch information
paigerube14 committed Dec 12, 2024
1 parent 2ba20fa commit 6816ea0
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 342 deletions.
7 changes: 1 addition & 6 deletions docs/node_scenarios.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,7 @@ How to set up Alibaba cli to run node scenarios is defined [here](cloud_setup.md
#### VMware
How to set up VMware vSphere to run node scenarios is defined [here](cloud_setup.md#vmware)

This cloud type uses a different configuration style, see actions below and [example config file](../scenarios/openshift/vmware_node_scenarios.yml)

- vmware-node-terminate
- vmware-node-reboot
- vmware-node-stop
- vmware-node-start
See [example config file](../scenarios/openshift/vmware_node_scenarios.yml)



Expand Down
1 change: 0 additions & 1 deletion krkn/scenario_plugins/native/native_scenario_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ def get_scenario_types(self) -> list[str]:
return [
"pod_disruption_scenarios",
"pod_network_scenarios",
"vmware_node_scenarios",
"ibmcloud_node_scenarios",
]

Expand Down
7 changes: 0 additions & 7 deletions krkn/scenario_plugins/native/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
)
from arcaflow_plugin_sdk import schema, serialization, jsonschema

from krkn.scenario_plugins.native.node_scenarios import vmware_plugin


@dataclasses.dataclass
class PluginStep:
schema: schema.StepSchema
Expand Down Expand Up @@ -160,10 +157,6 @@ def json_schema(self):
),
PluginStep(wait_for_pods, ["error"]),
PluginStep(run_python_file, ["error"]),
PluginStep(vmware_plugin.node_start, ["error"]),
PluginStep(vmware_plugin.node_stop, ["error"]),
PluginStep(vmware_plugin.node_reboot, ["error"]),
PluginStep(vmware_plugin.node_terminate, ["error"]),
PluginStep(ibmcloud_plugin.node_start, ["error"]),
PluginStep(ibmcloud_plugin.node_stop, ["error"]),
PluginStep(ibmcloud_plugin.node_reboot, ["error"]),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from krkn.scenario_plugins.node_actions.general_cloud_node_scenarios import (
general_node_scenarios,
)
from krkn.scenario_plugins.node_actions.vmware_node_scenarios import vmware_node_scenarios

node_general = False

Expand Down Expand Up @@ -78,12 +79,12 @@ def get_node_scenario_object(self, node_scenario, kubecli: KrknKubernetes):
return openstack_node_scenarios(kubecli)
elif (
node_scenario["cloud_type"].lower() == "azure"
or node_scenario["cloud_type"] == "az"
or node_scenario["cloud_type"].lower() == "az"
):
return azure_node_scenarios(kubecli)
elif (
node_scenario["cloud_type"].lower() == "alibaba"
or node_scenario["cloud_type"] == "alicloud"
or node_scenario["cloud_type"].lower() == "alicloud"
):
from krkn.scenario_plugins.node_actions.alibaba_node_scenarios import (
alibaba_node_scenarios,
Expand All @@ -103,6 +104,11 @@ def get_node_scenario_object(self, node_scenario, kubecli: KrknKubernetes):
)
elif node_scenario["cloud_type"].lower() == "docker":
return docker_node_scenarios(kubecli)
elif (
node_scenario["cloud_type"].lower() == "vsphere"
or node_scenario["cloud_type"].lower() == "vmware"
):
return vmware_node_scenarios(kubecli)
else:
logging.error(
"Cloud type "
Expand Down
Loading

0 comments on commit 6816ea0

Please sign in to comment.