11package run
22
33import (
4+ "encoding/json"
5+ "fmt"
46 "os"
57
68 "github.com/openshift-eng/openshift-tests-extension/pkg/extension"
@@ -28,9 +30,6 @@ type RunSuiteFlags struct {
2830 ToImage string
2931 TestOptions []string
3032
31- // Shared by initialization code
32- config * clusterdiscovery.ClusterConfiguration
33-
3433 genericclioptions.IOStreams
3534}
3635
@@ -84,7 +83,7 @@ func (f *RunSuiteFlags) ToOptions(args []string, availableSuites []*testginkgo.T
8483 // shallow copy to mutate
8584 ginkgoOptions := f .GinkgoRunSuiteOptions
8685
87- providerConfig , err := f .SuiteWithKubeTestInitializationPreSuite ()
86+ clusterConfig , err := f .SuiteWithKubeTestInitializationPreSuite ()
8887 if err != nil {
8988 return nil , err
9089 }
@@ -95,13 +94,39 @@ func (f *RunSuiteFlags) ToOptions(args []string, availableSuites []*testginkgo.T
9594 return nil , err
9695 }
9796
97+ // Parse hypervisor configuration if provided and set it in environment for test context
98+ if f .GinkgoRunSuiteOptions .WithHypervisorConfigJSON != "" {
99+ // Validate the JSON format
100+ var hypervisorConfig clusterdiscovery.HypervisorConfig
101+ if err := json .Unmarshal ([]byte (f .GinkgoRunSuiteOptions .WithHypervisorConfigJSON ), & hypervisorConfig ); err != nil {
102+ return nil , fmt .Errorf ("failed to parse hypervisor configuration JSON: %v" , err )
103+ }
104+
105+ // Validate required fields
106+ if hypervisorConfig .HypervisorIP == "" {
107+ return nil , fmt .Errorf ("hypervisorIP is required in hypervisor configuration" )
108+ }
109+ if hypervisorConfig .SSHUser == "" {
110+ return nil , fmt .Errorf ("sshUser is required in hypervisor configuration" )
111+ }
112+ if hypervisorConfig .PrivateKey == "" {
113+ return nil , fmt .Errorf ("privateKey is required in hypervisor configuration" )
114+ }
115+
116+ // Set the hypervisor configuration in the cluster config
117+ clusterConfig .HypervisorConfig = & hypervisorConfig
118+
119+ // Also set it in environment for test context access
120+ os .Setenv ("HYPERVISOR_CONFIG" , f .GinkgoRunSuiteOptions .WithHypervisorConfigJSON )
121+ }
122+
98123 o := & RunSuiteOptions {
99124 GinkgoRunSuiteOptions : ginkgoOptions ,
100125 Suite : suite ,
101126 Extension : internalExtension ,
102- ClusterConfig : providerConfig ,
127+ ClusterConfig : clusterConfig ,
103128 FromRepository : f .FromRepository ,
104- CloudProviderJSON : providerConfig .ToJSONString (),
129+ CloudProviderJSON : clusterConfig .ToJSONString (),
105130 CloseFn : closeFn ,
106131 IOStreams : f .IOStreams ,
107132 }
0 commit comments