@@ -41,14 +41,25 @@ import (
4141
4242var _ proto.ControllerServer = (* csi .ControllerService )(nil )
4343
44- type csiTestSuite struct {
44+ type baseCSITestSuite struct {
4545 suite.Suite
46-
4746 s * csi.ControllerService
4847}
4948
50- func (ts * csiTestSuite ) SetupTest () {
51- cfg , err := proxmox .ReadCloudConfig (strings .NewReader (`
49+ type configTestCase struct {
50+ name string
51+ config string
52+ providerID string
53+ }
54+
55+ func getTestConfigs () []configTestCase {
56+ return []configTestCase {
57+ {
58+ name : "CapMoxProvider" ,
59+ providerID : "proxmox://11833f4c-341f-4bd3-aad7-f7abeda472e6" ,
60+ config : `
61+ features:
62+ provider: capmox
5263clusters:
5364- url: https://127.0.0.1:8006/api2/json
5465 insecure: false
@@ -59,12 +70,36 @@ clusters:
5970 insecure: false
6071 token_id: "user!token-id"
6172 token_secret: "secret"
62- region: cluster-2
63- ` ))
64- if err != nil {
65- ts .T ().Fatalf ("failed to read config: %v" , err )
73+ region: cluster-2` ,
74+ },
75+ {
76+ name : "ExplicitDefaultProvider" ,
77+ providerID : "proxmox://cluster-1/101" ,
78+ config : `
79+ features:
80+ provider: capmox
81+ clusters:
82+ - url: https://127.0.0.1:8006/api2/json
83+ insecure: false
84+ token_id: "user!token-id"
85+ token_secret: "secret"
86+ region: cluster-1` ,
87+ },
88+ {
89+ name : "ImplicitDefaultProvider" ,
90+ providerID : "proxmox://cluster-1/101" ,
91+ config : `
92+ clusters:
93+ - url: https://127.0.0.1:8006/api2/json
94+ insecure: false
95+ token_id: "user!token-id"
96+ token_secret: "secret"
97+ region: cluster-1` ,
98+ },
6699 }
100+ }
67101
102+ func setupMockResponders () {
68103 httpmock .RegisterResponder ("GET" , "https://127.0.0.1:8006/api2/json/cluster/resources" ,
69104 func (_ * http.Request ) (* http.Response , error ) {
70105 return httpmock .NewJsonResponse (200 , map [string ]interface {}{
@@ -286,10 +321,12 @@ clusters:
286321 })
287322 },
288323 )
324+ }
289325
290- cluster , err := proxmox .NewCluster (& cfg , & http.Client {})
326+ func (ts * baseCSITestSuite ) setupTestSuite (config string , providerID string ) error {
327+ cfg , err := proxmox .ReadCloudConfig (strings .NewReader (config ))
291328 if err != nil {
292- ts . T (). Fatalf ( "failed to create proxmox cluster client : %v" , err )
329+ return fmt . Errorf ( "failed to read config : %v" , err )
293330 }
294331
295332 nodes := & corev1.NodeList {
@@ -303,22 +340,56 @@ clusters:
303340 Name : "cluster-1-node-2" ,
304341 },
305342 Spec : corev1.NodeSpec {
306- ProviderID : "proxmox://cluster-1/101" ,
343+ ProviderID : providerID ,
307344 },
308345 },
309346 },
310347 }
311348
312349 kclient := fake .NewSimpleClientset (nodes )
313350
351+ cluster , err := proxmox .NewCluster (& cfg , & http.Client {})
352+ if err != nil {
353+ return fmt .Errorf ("failed to create proxmox cluster client: %v" , err )
354+ }
355+
314356 ts .s = & csi.ControllerService {
315- Cluster : cluster ,
316- Kclient : kclient ,
357+ Cluster : cluster ,
358+ Kclient : kclient ,
359+ Provider : cfg .Features .Provider ,
360+ }
361+
362+ return nil
363+ }
364+
365+ // TestSuiteCSI runs all test configurations
366+ func TestSuiteCSI (t * testing.T ) {
367+ configs := getTestConfigs ()
368+ for _ , cfg := range configs {
369+ // Create a new test suite for each configuration
370+ ts := & baseCSITestSuite {}
371+
372+ // Run the suite with the current configuration
373+ suite .Run (t , & configuredTestSuite {
374+ baseCSITestSuite : ts ,
375+ configCase : cfg ,
376+ })
317377 }
318378}
319379
320- func TestSuiteCCM (t * testing.T ) {
321- suite .Run (t , new (csiTestSuite ))
380+ // configuredTestSuite wraps the base suite with a specific configuration
381+ type configuredTestSuite struct {
382+ * baseCSITestSuite
383+ configCase configTestCase
384+ }
385+
386+ func (ts * configuredTestSuite ) SetupTest () {
387+ setupMockResponders ()
388+
389+ err := ts .setupTestSuite (ts .configCase .config , ts .configCase .providerID )
390+ if err != nil {
391+ ts .T ().Fatalf ("Failed to setup test suite: %v" , err )
392+ }
322393}
323394
324395func TestNewControllerService (t * testing.T ) {
@@ -333,7 +404,7 @@ func TestNewControllerService(t *testing.T) {
333404}
334405
335406//nolint:dupl
336- func (ts * csiTestSuite ) TestCreateVolume () {
407+ func (ts * configuredTestSuite ) TestCreateVolume () {
337408 httpmock .Activate ()
338409 defer httpmock .DeactivateAndReset ()
339410
@@ -682,7 +753,7 @@ func (ts *csiTestSuite) TestCreateVolume() {
682753}
683754
684755//nolint:dupl
685- func (ts * csiTestSuite ) TestDeleteVolume () {
756+ func (ts * configuredTestSuite ) TestDeleteVolume () {
686757 httpmock .Activate ()
687758 defer httpmock .DeactivateAndReset ()
688759
@@ -758,7 +829,7 @@ func (ts *csiTestSuite) TestDeleteVolume() {
758829 }
759830}
760831
761- func (ts * csiTestSuite ) TestControllerServiceControllerGetCapabilities () {
832+ func (ts * configuredTestSuite ) TestControllerServiceControllerGetCapabilities () {
762833 resp , err := ts .s .ControllerGetCapabilities (context .Background (), & proto.ControllerGetCapabilitiesRequest {})
763834 ts .Require ().NoError (err )
764835 ts .Require ().NotNil (resp )
@@ -769,7 +840,7 @@ func (ts *csiTestSuite) TestControllerServiceControllerGetCapabilities() {
769840}
770841
771842//nolint:dupl
772- func (ts * csiTestSuite ) TestControllerPublishVolumeError () {
843+ func (ts * configuredTestSuite ) TestControllerPublishVolumeError () {
773844 httpmock .Activate ()
774845 defer httpmock .DeactivateAndReset ()
775846
@@ -903,7 +974,7 @@ func (ts *csiTestSuite) TestControllerPublishVolumeError() {
903974}
904975
905976//nolint:dupl
906- func (ts * csiTestSuite ) TestControllerUnpublishVolumeError () {
977+ func (ts * configuredTestSuite ) TestControllerUnpublishVolumeError () {
907978 httpmock .Activate ()
908979 defer httpmock .DeactivateAndReset ()
909980
@@ -975,19 +1046,19 @@ func (ts *csiTestSuite) TestControllerUnpublishVolumeError() {
9751046 }
9761047}
9771048
978- func (ts * csiTestSuite ) TestValidateVolumeCapabilities () {
1049+ func (ts * configuredTestSuite ) TestValidateVolumeCapabilities () {
9791050 _ , err := ts .s .ValidateVolumeCapabilities (context .Background (), & proto.ValidateVolumeCapabilitiesRequest {})
9801051 ts .Require ().Error (err )
9811052 ts .Require ().Equal (status .Error (codes .Unimplemented , "" ), err )
9821053}
9831054
984- func (ts * csiTestSuite ) TestListVolumes () {
1055+ func (ts * configuredTestSuite ) TestListVolumes () {
9851056 _ , err := ts .s .ListVolumes (context .Background (), & proto.ListVolumesRequest {})
9861057 ts .Require ().Error (err )
9871058 ts .Require ().Equal (status .Error (codes .Unimplemented , "" ), err )
9881059}
9891060
990- func (ts * csiTestSuite ) TestGetCapacity () {
1061+ func (ts * configuredTestSuite ) TestGetCapacity () {
9911062 httpmock .Activate ()
9921063 defer httpmock .DeactivateAndReset ()
9931064
@@ -1115,25 +1186,25 @@ func (ts *csiTestSuite) TestGetCapacity() {
11151186 }
11161187}
11171188
1118- func (ts * csiTestSuite ) TestCreateSnapshot () {
1189+ func (ts * configuredTestSuite ) TestCreateSnapshot () {
11191190 _ , err := ts .s .CreateSnapshot (context .Background (), & proto.CreateSnapshotRequest {})
11201191 ts .Require ().Error (err )
11211192 ts .Require ().Equal (status .Error (codes .Unimplemented , "" ), err )
11221193}
11231194
1124- func (ts * csiTestSuite ) TestDeleteSnapshot () {
1195+ func (ts * configuredTestSuite ) TestDeleteSnapshot () {
11251196 _ , err := ts .s .DeleteSnapshot (context .Background (), & proto.DeleteSnapshotRequest {})
11261197 ts .Require ().Error (err )
11271198 ts .Require ().Equal (status .Error (codes .Unimplemented , "" ), err )
11281199}
11291200
1130- func (ts * csiTestSuite ) TestListSnapshots () {
1201+ func (ts * configuredTestSuite ) TestListSnapshots () {
11311202 _ , err := ts .s .ListSnapshots (context .Background (), & proto.ListSnapshotsRequest {})
11321203 ts .Require ().Error (err )
11331204 ts .Require ().Equal (status .Error (codes .Unimplemented , "" ), err )
11341205}
11351206
1136- func (ts * csiTestSuite ) TestControllerExpandVolumeError () {
1207+ func (ts * configuredTestSuite ) TestControllerExpandVolumeError () {
11371208 httpmock .Activate ()
11381209 defer httpmock .DeactivateAndReset ()
11391210
@@ -1249,7 +1320,7 @@ func (ts *csiTestSuite) TestControllerExpandVolumeError() {
12491320 }
12501321}
12511322
1252- func (ts * csiTestSuite ) TestControllerGetVolume () {
1323+ func (ts * configuredTestSuite ) TestControllerGetVolume () {
12531324 _ , err := ts .s .ControllerGetVolume (context .Background (), & proto.ControllerGetVolumeRequest {})
12541325 ts .Require ().Error (err )
12551326 ts .Require ().Equal (status .Error (codes .Unimplemented , "" ), err )
0 commit comments