Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AS] Fix issue with disk size validation #1084

Merged
merged 5 commits into from
May 25, 2021
Merged

[AS] Fix issue with disk size validation #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5bb3aa
Update validation of SYS disk size
lego963 May 25, 2021
d0fdc55
Update test-case and doc
lego963 May 25, 2021
3eac269
Fix test case
lego963 May 25, 2021
f7b14b7
Fix issues in doc
lego963 May 25, 2021
2d4bcfe
Revert changes in test-cases
lego963 May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docs/resources/as_configuration_v1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,9 @@ The `instance_config` block supports:

The `disk` block supports:

* `size` - (Required) The disk size. The unit is GB. The system disk size ranges from 40 to 32768,
and the data disk size ranges from 10 to 32768.
* `size` - (Required) The disk size. The unit is GB. The system disk size ranges from `4` to `32768` and must
be greater than or equal to the minimum size (`min_disk` value) of the system disk specified in the image.
The data disk size ranges from `10` to `32768`.

* `volume_type` - (Required) Specifies the ECS system disk type. The disk type must match the available disk type.
* `SATA`: common I/O disk type.
Expand Down
2 changes: 1 addition & 1 deletion opentelekomcloud/acceptance/as/resource_opentelekomcloud_as_configuration_v1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ resource "opentelekomcloud_as_configuration_v1" "as_config"{
instance_config {
image = "%s"
disk {
size = 10
size = 1
volume_type = "uh-l1"
disk_type = "SYS"
}
Expand Down
4 changes: 2 additions & 2 deletions opentelekomcloud/services/as/resource_opentelekomcloud_as_configuration_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ func validateDiskSize(d *schema.ResourceDiff, _ interface{}) error {
size := disk["size"].(int)
diskType := disk["disk_type"].(string)
if diskType == "SYS" {
if size < 40 || size > 32768 {
mErr = multierror.Append(mErr, fmt.Errorf("for system disk size should be [40, 32768]"))
if size < 4 || size > 32768 {
mErr = multierror.Append(mErr, fmt.Errorf("for system disk size should be [4, 32768]"))
}
}
if diskType == "DATA" {
Expand Down