Skip to content

Commit 254d93b

Browse files
committed
Add test for unmanaged cluster on ACS
1 parent 924ef97 commit 254d93b

File tree

7 files changed

+257
-10
lines changed

7 files changed

+257
-10
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.19
44

55
require (
66
github.com/ReneKroon/ttlcache v1.7.0
7-
github.com/apache/cloudstack-go/v2 v2.16.0-rc.1
7+
github.com/apache/cloudstack-go/v2 v2.16.0-rc.2
88
github.com/go-logr/logr v1.2.3
99
github.com/golang/mock v1.6.0
1010
github.com/hashicorp/go-multierror v1.1.1

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrG
9191
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
9292
github.com/apache/cloudstack-go/v2 v2.16.0-rc.1 h1:Jzp5XG9dxnYJMU9F7+7jXR5fuD2KlcIXaxe3JzkcYdo=
9393
github.com/apache/cloudstack-go/v2 v2.16.0-rc.1/go.mod h1:Mc+tXpujtslBuZFk5atoGT2LanVxOrXS2GGgidAoz1A=
94+
github.com/apache/cloudstack-go/v2 v2.16.0-rc.2 h1:Vare0MkgdEbAEY1dZtcz/m6HRdK+NKkuoiF6WwC1t2g=
95+
github.com/apache/cloudstack-go/v2 v2.16.0-rc.2/go.mod h1:Mc+tXpujtslBuZFk5atoGT2LanVxOrXS2GGgidAoz1A=
9496
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
9597
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
9698
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=

test/e2e/common.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"errors"
2323
"fmt"
2424
"path/filepath"
25+
"strconv"
2526
"strings"
2627
"time"
27-
"strconv"
2828

2929
apierrors "k8s.io/apimachinery/pkg/api/errors"
3030

@@ -250,6 +250,17 @@ func DownloadMetricsFromCAPCManager(ctx context.Context, bootstrapKubeconfigPath
250250
return result, nil
251251
}
252252

253+
func GetACSVersion(client *cloudstack.CloudStackClient) (string, error) {
254+
msServersResp, err := client.InfrastructureUsage.ListManagementServersMetrics(client.InfrastructureUsage.NewListManagementServersMetricsParams())
255+
if err != nil {
256+
return "", err
257+
}
258+
if msServersResp.Count == 0 {
259+
return "", errors.New("no management servers found")
260+
}
261+
return msServersResp.ManagementServersMetrics[0].Version, nil
262+
}
263+
253264
func DestroyOneMachine(client *cloudstack.CloudStackClient, clusterName string, machineType string) {
254265
matcher := clusterName + "-" + machineType
255266

test/e2e/go.mod

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ go 1.19
44

55
require (
66
github.com/Shopify/toxiproxy/v2 v2.5.0
7-
github.com/apache/cloudstack-go/v2 v2.13.0
7+
github.com/apache/cloudstack-go/v2 v2.16.0-rc.2
88
github.com/blang/semver v3.5.1+incompatible
99
github.com/onsi/ginkgo v1.16.5
10-
github.com/onsi/gomega v1.20.1
10+
github.com/onsi/gomega v1.27.4
1111
gopkg.in/yaml.v3 v3.0.1
1212
k8s.io/api v0.25.3
1313
k8s.io/apimachinery v0.25.3
@@ -44,6 +44,7 @@ require (
4444
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4545
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4646
github.com/fsnotify/fsnotify v1.5.4 // indirect
47+
github.com/go-errors/errors v1.0.1 // indirect
4748
github.com/go-logr/logr v1.2.3 // indirect
4849
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4950
github.com/go-openapi/jsonreference v0.19.5 // indirect
@@ -52,13 +53,14 @@ require (
5253
github.com/gogo/protobuf v1.3.2 // indirect
5354
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5455
github.com/golang/mock v1.6.0 // indirect
55-
github.com/golang/protobuf v1.5.2 // indirect
56+
github.com/golang/protobuf v1.5.3 // indirect
5657
github.com/google/cel-go v0.12.4 // indirect
5758
github.com/google/gnostic v0.5.7-v3refs // indirect
58-
github.com/google/go-cmp v0.5.8 // indirect
59+
github.com/google/go-cmp v0.5.9 // indirect
5960
github.com/google/go-github/v45 v45.2.0 // indirect
6061
github.com/google/go-querystring v1.1.0 // indirect
6162
github.com/google/gofuzz v1.2.0 // indirect
63+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6264
github.com/google/uuid v1.2.0 // indirect
6365
github.com/hashicorp/hcl v1.0.0 // indirect
6466
github.com/huandu/xstrings v1.3.3 // indirect
@@ -69,14 +71,17 @@ require (
6971
github.com/magiconair/properties v1.8.6 // indirect
7072
github.com/mailru/easyjson v0.7.6 // indirect
7173
github.com/mattn/go-isatty v0.0.16 // indirect
74+
github.com/mattn/go-runewidth v0.0.13 // indirect
7275
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
7376
github.com/mitchellh/copystructure v1.2.0 // indirect
7477
github.com/mitchellh/mapstructure v1.5.0 // indirect
7578
github.com/mitchellh/reflectwalk v1.0.2 // indirect
7679
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7780
github.com/modern-go/reflect2 v1.0.2 // indirect
81+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7882
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7983
github.com/nxadm/tail v1.4.8 // indirect
84+
github.com/olekukonko/tablewriter v0.0.5 // indirect
8085
github.com/opencontainers/go-digest v1.0.0 // indirect
8186
github.com/opencontainers/image-spec v1.0.2 // indirect
8287
github.com/pelletier/go-toml v1.9.5 // indirect
@@ -86,6 +91,7 @@ require (
8691
github.com/prometheus/client_model v0.2.0 // indirect
8792
github.com/prometheus/common v0.37.0 // indirect
8893
github.com/prometheus/procfs v0.8.0 // indirect
94+
github.com/rivo/uniseg v0.2.0 // indirect
8995
github.com/shopspring/decimal v1.2.0 // indirect
9096
github.com/spf13/afero v1.8.2 // indirect
9197
github.com/spf13/cast v1.5.0 // indirect
@@ -96,12 +102,14 @@ require (
96102
github.com/stoewer/go-strcase v1.2.0 // indirect
97103
github.com/subosito/gotenv v1.3.0 // indirect
98104
github.com/valyala/fastjson v1.6.3 // indirect
105+
github.com/xlab/treeprint v1.1.0 // indirect
106+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
99107
golang.org/x/crypto v0.3.0 // indirect
100-
golang.org/x/net v0.7.0 // indirect
108+
golang.org/x/net v0.8.0 // indirect
101109
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
102-
golang.org/x/sys v0.5.0 // indirect
103-
golang.org/x/term v0.5.0 // indirect
104-
golang.org/x/text v0.7.0 // indirect
110+
golang.org/x/sys v0.6.0 // indirect
111+
golang.org/x/term v0.6.0 // indirect
112+
golang.org/x/text v0.8.0 // indirect
105113
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
106114
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
107115
google.golang.org/appengine v1.6.7 // indirect
@@ -120,6 +128,10 @@ require (
120128
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
121129
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
122130
sigs.k8s.io/kind v0.14.0 // indirect
131+
sigs.k8s.io/kustomize/api v0.12.1 // indirect
132+
sigs.k8s.io/kustomize/cmd/config v0.10.9 // indirect
133+
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 // indirect
134+
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
123135
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
124136
sigs.k8s.io/yaml v1.3.0 // indirect
125137
)

0 commit comments

Comments
 (0)