Multi disk support #40
Merged
Conversation
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
added 14 commits
March 9, 2021 09:24
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
|
/ok-to-test sha=cde6ae1 |
X4mp
commented
Mar 17, 2021
Makefile
Outdated
| @@ -6,7 +6,7 @@ HOSTNAME=hashicorp.com | |||
| NAMESPACE=anexia-it | |||
| NAME=anxcloud | |||
| BINARY=terraform-provider-${NAME} | |||
| VERSION=0.2.3 | |||
| VERSION=0.2.5 | |||
There was a problem hiding this comment.
Don't change the version in a feature branch. It should only be incremented for release.
anxcloud/schema_virtual_server.go
Outdated
| Description: "Requested disk capacity in GB.", | ||
| }, | ||
| "disk_type": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| Description: "Requested disk category (limits disk performance, e.g. IOPS). Default as defined by data center.", | ||
| }, | ||
| "disks": { |
There was a problem hiding this comment.
remove legacy support for disk as attribute and change the attribute name for the list to disk.
anxcloud/resource_virtual_server.go
Outdated
| @@ -259,17 +288,20 @@ func resourceVirtualServerRead(ctx context.Context, d *schema.ResourceData, m in | |||
| diags = append(diags, diag.FromErr(err)...) | |||
| } | |||
|
|
|||
| if len(info.DiskInfo) != 1 { | |||
| return diag.Errorf("unsupported number of disks, currently only 1 disk is allowed, got %d", len(info.DiskInfo)) | |||
| var disks []vm.Disk | |||
There was a problem hiding this comment.
known list length. Use capacity and length to pre-create the list object.
| ChangeDisks: changeDisks, | ||
| } | ||
|
|
||
| v := vsphere.NewAPI(c) |
There was a problem hiding this comment.
use vsphereAPI over just v as variable name.
anxcloud/struct_virtual_server.go
Outdated
| @@ -244,3 +270,20 @@ func flattenVirtualServerInfo(in *info.Info) []interface{} { | |||
|
|
|||
| return []interface{}{att} | |||
| } | |||
|
|
|||
| func flattenVirtualServerDisks(in []vm.Disk) []interface{} { | |||
| att := []interface{}{} | |||
anxcloud/struct_virtual_server.go
Outdated
| @@ -36,6 +36,32 @@ func expandVirtualServerNetworks(p []interface{}) []vm.Network { | |||
| return networks | |||
| } | |||
|
|
|||
| func expandVirtualServerDisks(p []interface{}) []vm.Disk { | |||
| var disks []vm.Disk | |||
anxcloud/resource_virtual_server.go
Outdated
| } | ||
| if err = d.Set("disk", info.DiskInfo[0].DiskGB); err != nil { | ||
|
|
||
| fDisks := flattenVirtualServerDisks(disks) |
There was a problem hiding this comment.
Use a better name for fDisks.
| @@ -98,6 +98,65 @@ func TestAccAnxCloudVirtualServer(t *testing.T) { | |||
| }) | |||
| } | |||
|
|
|||
| func TestAccAnxCloudVirtualServerMultiDiskScaling(t *testing.T) { | |||
There was a problem hiding this comment.
Implement all testcases for cases supported by the create/update logic.
added 9 commits
March 17, 2021 11:36
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
Signed-off-by: Roland Urbano <[email protected]>
|
/ok-to-test sha=2ea429f |
Signed-off-by: Roland Urbano <[email protected]>
|
/ok-to-test sha=616d14b |
Signed-off-by: Roland Urbano <[email protected]>
|
/ok-to-test sha=5a11c64 |
Signed-off-by: Roland Urbano <[email protected]>
|
/ok-to-test sha=f3bb0b0 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This Pull Request introduces a temparary implementation to support multiple disks when creating or updating a
virtual server. This is temporary until the backend/API allows to configure multiple disks natively. Until then creating avirtual serverwith multiple disks requires to create it with one disk and then update it with the rest. This is done automatically ifdisksis configured with the plan.Acceptance tests
Output from acceptance testing:
Release Note
Release note for CHANGELOG:
References
None
Community Note