-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from narkarum/v2
v2 changes
- Loading branch information
Showing
12 changed files
with
345 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
130 changes: 130 additions & 0 deletions
130
volume-providers/vpc/vpcclient/instances/get_volume_attachment_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| /******************************************************************************* | ||
| * IBM Confidential | ||
| * OCO Source Materials | ||
| * IBM Cloud Container Service, 5737-D43 | ||
| * (C) Copyright IBM Corp. 2018 All Rights Reserved. | ||
| * The source code for this program is not published or otherwise divested of | ||
| * its trade secrets, irrespective of what has been deposited with | ||
| * the U.S. Copyright Office. | ||
| ******************************************************************************/ | ||
|
|
||
| package instances_test | ||
|
|
||
| import ( | ||
| "github.com/IBM/ibmcloud-storage-volume-lib/volume-providers/vpc/vpcclient/instances" | ||
| "github.com/IBM/ibmcloud-storage-volume-lib/volume-providers/vpc/vpcclient/models" | ||
| "github.com/IBM/ibmcloud-storage-volume-lib/volume-providers/vpc/vpcclient/riaas/test" | ||
| "github.com/stretchr/testify/assert" | ||
| "go.uber.org/zap" | ||
| "net/http" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestGetVolumeAttachment(t *testing.T) { | ||
| // Setup new style zap logger | ||
| logger, _ := GetTestContextLogger() | ||
| defer logger.Sync() | ||
|
|
||
| instanceID := "testinstance" | ||
|
|
||
| testCases := []struct { | ||
| name string | ||
|
|
||
| // Response | ||
| status int | ||
| content string | ||
|
|
||
| // Expected return | ||
| expectErr string | ||
| verify func(*testing.T, *http.Response, error) | ||
| }{ | ||
| { | ||
| name: "Verify that the get volume attachment is done correctly", | ||
| status: http.StatusOK, | ||
| content: "{\"id\":\"volumeattachmentid\", \"name\":\"volume attachment\", \"device\": {\"id\":\"xvdc\"}, \"volume\": {\"id\":\"volume-id\",\"name\":\"volume-name\",\"capacity\":10,\"iops\":3000,\"status\":\"pending\"}}", | ||
| verify: func(t *testing.T, httpResponse *http.Response, err error) { | ||
| if assert.Nil(t, err) { | ||
| assert.Nil(t, httpResponse) | ||
| } | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, testcase := range testCases { | ||
| t.Run(testcase.name, func(t *testing.T) { | ||
|
|
||
| template := &models.VolumeAttachment{ | ||
| ID: "volumeattachmentid", | ||
| Name: "volumeattachment", | ||
| InstanceID: &instanceID, | ||
| Volume: &models.Volume{ | ||
| ID: "volume-id", | ||
| Name: "volume-name", | ||
| Capacity: 10, | ||
| ResourceGroup: &models.ResourceGroup{ | ||
| ID: "rg1", | ||
| }, | ||
| Generation: models.GenerationType("gc"), | ||
| Zone: &models.Zone{Name: "test-1"}, | ||
| }, | ||
| } | ||
|
|
||
| mux, client, teardown := test.SetupServer(t) | ||
| test.SetupMuxResponse(t, mux, "/v1/instances/testinstance/volume_attachments/volumeattachmentid", http.MethodGet, nil, testcase.status, testcase.content, nil) | ||
|
|
||
| defer teardown() | ||
|
|
||
| logger.Info("Test case being executed", zap.Reflect("testcase", testcase.name)) | ||
|
|
||
| volumeAttachService := instances.New(client) | ||
|
|
||
| response, err := volumeAttachService.GetVolumeAttachment(template, logger) | ||
|
|
||
| if testcase.expectErr != "" && assert.Error(t, err) { | ||
| assert.Equal(t, testcase.expectErr, err.Error()) | ||
| assert.NotNil(t, response) | ||
| } else { | ||
| assert.NoError(t, err) | ||
| assert.NotNil(t, response) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestIKSGetVolumeAttachment(t *testing.T) { | ||
| // Setup new style zap logger | ||
| logger, _ := GetTestContextLogger() | ||
| defer logger.Sync() | ||
|
|
||
| instanceID := "testinstance" | ||
| clusterID := "testcluster" | ||
| // IKS tests | ||
| mux, client, teardown := test.SetupServer(t) | ||
| content := "{\"id\":\"volumeattachmentid\", \"name\":\"volume attachment\", \"device\": {\"id\":\"xvdc\"}, \"volume\": {\"id\":\"volume-id\",\"name\":\"volume-name\",\"capacity\":10,\"iops\":3000,\"status\":\"pending\"}}" | ||
|
|
||
| test.SetupMuxResponse(t, mux, "/v2/storage/getAttachment", http.MethodGet, nil, http.StatusOK, content, nil) | ||
| volumeAttachService := instances.NewIKSVolumeAttachmentManager(client) | ||
|
|
||
| template := &models.VolumeAttachment{ | ||
| ID: "volumeattachmentid", | ||
| Name: "volume attachment", | ||
| ClusterID: &clusterID, | ||
| InstanceID: &instanceID, | ||
| Volume: &models.Volume{ | ||
| ID: "volume-id", | ||
| Name: "volume-name", | ||
| Capacity: 10, | ||
| ResourceGroup: &models.ResourceGroup{ | ||
| ID: "rg1", | ||
| }, | ||
| Generation: models.GenerationType("gc"), | ||
| Zone: &models.Zone{Name: "test-1"}, | ||
| }, | ||
| } | ||
| defer teardown() | ||
|
|
||
| response, err := volumeAttachService.GetVolumeAttachment(template, logger) | ||
|
|
||
| assert.NoError(t, err) | ||
| assert.NotNil(t, response) | ||
| } |
Oops, something went wrong.