Update test/e2e/go.mod

vishesh92 · vishesh92 · commit 13a0687f3a31 · 2023-08-22T10:47:58.000+05:30
diff --git a/test/e2e/common.go b/test/e2e/common.go
@@ -251,14 +251,14 @@ func DownloadMetricsFromCAPCManager(ctx context.Context, bootstrapKubeconfigPath
 }
 
 func GetACSVersion(client *cloudstack.CloudStackClient) (string, error) {
-	msServersResp, err := client.InfrastructureUsage.ListManagementServersMetrics(client.InfrastructureUsage.NewListManagementServersMetricsParams())
+	msServersResp, err := client.InfrastructureUsage.ListManagementServers(client.InfrastructureUsage.NewListManagementServersParams())
 	if err != nil {
 		return "", err
 	}
 	if msServersResp.Count == 0 {
 		return "", errors.New("no management servers found")
 	}
-	return msServersResp.ManagementServersMetrics[0].Version, nil
+	return msServersResp.ManagementServers[0].Version, nil
 }
 
 func DestroyOneMachine(client *cloudstack.CloudStackClient, clusterName string, machineType string) {
diff --git a/test/e2e/go.mod b/test/e2e/go.mod
@@ -137,3 +137,5 @@ require (
 )
 
 replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.12
+
+replace github.com/apache/cloudstack-go/v2 => github.com/shapeblue/cloudstack-go/v2 v2.9.1-0.20230821182853-7e3eacb8c381
diff --git a/test/e2e/go.sum b/test/e2e/go.sum
@@ -485,6 +485,10 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/shapeblue/cloudstack-go/v2 v2.9.1-0.20230821174931-850c8f836fba h1:xQURtr9H7Ik+WJaEo4qYuN5Vo+aagAd7bVA5qAWeQj8=
+github.com/shapeblue/cloudstack-go/v2 v2.9.1-0.20230821174931-850c8f836fba/go.mod h1:Mc+tXpujtslBuZFk5atoGT2LanVxOrXS2GGgidAoz1A=
+github.com/shapeblue/cloudstack-go/v2 v2.9.1-0.20230821182853-7e3eacb8c381 h1:eMPPCGnfpj8hKQBpZvp4Bn85gV0gawZRLolD++jU86k=
+github.com/shapeblue/cloudstack-go/v2 v2.9.1-0.20230821182853-7e3eacb8c381/go.mod h1:Mc+tXpujtslBuZFk5atoGT2LanVxOrXS2GGgidAoz1A=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
diff --git a/test/e2e/unmanaged_k8s.go b/test/e2e/unmanaged_k8s.go
@@ -55,7 +55,7 @@ func UnmanagedK8SSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
 			Skip("Failed to get CloudStack's version")
 		}
 
-		v, err := semver.ParseTolerant(version)
+		v, err := semver.ParseTolerant(strings.Join(strings.Split(version, ".")[0:3], "."))
 
 		if err != nil {
 			Skip("Failed to parse CloudStack version " + version)

Original file line number	Diff line number	Diff line change
`@@ -251,14 +251,14 @@ func DownloadMetricsFromCAPCManager(ctx context.Context, bootstrapKubeconfigPath`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`func GetACSVersion(client *cloudstack.CloudStackClient) (string, error) {`
`254`		`- msServersResp, err := client.InfrastructureUsage.ListManagementServersMetrics(client.InfrastructureUsage.NewListManagementServersMetricsParams())`
	`254`	`+ msServersResp, err := client.InfrastructureUsage.ListManagementServers(client.InfrastructureUsage.NewListManagementServersParams())`
`255`	`255`	`if err != nil {`
`256`	`256`	`return "", err`
`257`	`257`	`}`
`258`	`258`	`if msServersResp.Count == 0 {`
`259`	`259`	`return "", errors.New("no management servers found")`
`260`	`260`	`}`
`261`		`- return msServersResp.ManagementServersMetrics[0].Version, nil`
	`261`	`+ return msServersResp.ManagementServers[0].Version, nil`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`func DestroyOneMachine(client *cloudstack.CloudStackClient, clusterName string, machineType string) {`
Original file line number	Diff line number	Diff line change
`@@ -137,3 +137,5 @@ require (`
`137`	`137`	`)`
`138`	`138`
`139`	`139`	`replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.12`
	`140`	`+`
	`141`	`+replace github.com/apache/cloudstack-go/v2 => github.com/shapeblue/cloudstack-go/v2 v2.9.1-0.20230821182853-7e3eacb8c381`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func UnmanagedK8SSpec(ctx context.Context, inputGetter func() CommonSpecInput) {`
`55`	`55`	`Skip("Failed to get CloudStack's version")`
`56`	`56`	`}`
`57`	`57`
`58`		`- v, err := semver.ParseTolerant(version)`
	`58`	`+ v, err := semver.ParseTolerant(strings.Join(strings.Split(version, ".")[0:3], "."))`
`59`	`59`
`60`	`60`	`if err != nil {`
`61`	`61`	`Skip("Failed to parse CloudStack version " + version)`