Update memory_size to GB for compute_flavors (#623)

huaweicloud · Oct 31, 2020 · 5db4cc1 · 5db4cc1
1 parent 2c04b01
commit 5db4cc1
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 25 deletions.
diff --git a/docs/data-sources/compute_flavors.md b/docs/data-sources/compute_flavors.md
@@ -10,9 +10,10 @@ Use this data source to get the ID of the available Compute Flavors.
 
 ```hcl
 data "huaweicloud_compute_flavors" "flavors" {
-  performance_type = "normal"
-  cpu_core_count   = 2
-  memory_size      = 4096
+  availability_zone = "cn-north-4a"
+  performance_type  = "normal"
+  cpu_core_count    = 2
+  memory_size       = 4
 }
 
 # Create ECS instance with the first matched flavor
@@ -34,7 +35,7 @@ resource "huaweicloud_compute_instance" "instance" {
 
 * `cpu_core_count` - (Optional) Specifies the number of vCPUs in the ECS flavor.
 
-* `memory_size` - (Optional) Specifies the memory size(MB) in the ECS flavor.
+* `memory_size` - (Optional) Specifies the memory size(GB) in the ECS flavor.
 
 
 ## Attributes Reference

diff --git a/docs/resources/compute_instance.md b/docs/resources/compute_instance.md
@@ -15,9 +15,10 @@ This is an alternative to `huaweicloud_compute_instance_v2`
 data "huaweicloud_availability_zones" "myaz" {}
 
 data "huaweicloud_compute_flavors" "myflavor" {
-  performance_type = "normal"
-  cpu_core_count   = 2
-  memory_size      = 4096
+  availability_zone = data.huaweicloud_availability_zones.myaz.names[0]
+  performance_type  = "normal"
+  cpu_core_count    = 2
+  memory_size       = 4
 }
 
 data "huaweicloud_vpc_subnet" "mynet" {

diff --git a/examples/ecs/associated-eip/main.tf b/examples/ecs/associated-eip/main.tf
@@ -1,9 +1,10 @@
 data "huaweicloud_availability_zones" "myaz" {}
 
 data "huaweicloud_compute_flavors" "myflavor" {
-  performance_type = "normal"
-  cpu_core_count   = 2
-  memory_size      = 4096
+  availability_zone = data.huaweicloud_availability_zones.myaz.names[0]
+  performance_type  = "normal"
+  cpu_core_count    = 2
+  memory_size       = 4
 }
 
 data "huaweicloud_vpc_subnet" "mynet" {

diff --git a/examples/ecs/attached-interface/main.tf b/examples/ecs/attached-interface/main.tf
@@ -1,9 +1,10 @@
 data "huaweicloud_availability_zones" "myaz" {}
 
 data "huaweicloud_compute_flavors" "myflavor" {
-  performance_type = "normal"
-  cpu_core_count   = 2
-  memory_size      = 4096
+  availability_zone = data.huaweicloud_availability_zones.myaz.names[0]
+  performance_type  = "normal"
+  cpu_core_count    = 2
+  memory_size       = 4
 }
 
 data "huaweicloud_vpc_subnet" "mynet" {

diff --git a/examples/ecs/attached-volume/main.tf b/examples/ecs/attached-volume/main.tf
@@ -1,9 +1,10 @@
 data "huaweicloud_availability_zones" "myaz" {}
 
 data "huaweicloud_compute_flavors" "myflavor" {
-  performance_type = "normal"
-  cpu_core_count   = 2
-  memory_size      = 4096
+  availability_zone = data.huaweicloud_availability_zones.myaz.names[0]
+  performance_type  = "normal"
+  cpu_core_count    = 2
+  memory_size       = 4
 }
 
 data "huaweicloud_vpc_subnet" "mynet" {

diff --git a/examples/ecs/basic/main.tf b/examples/ecs/basic/main.tf
@@ -1,9 +1,10 @@
 data "huaweicloud_availability_zones" "myaz" {}
 
 data "huaweicloud_compute_flavors" "myflavor" {
-  performance_type = "normal"
-  cpu_core_count   = 2
-  memory_size      = 4096
+  availability_zone = data.huaweicloud_availability_zones.myaz.names[0]
+  performance_type  = "normal"
+  cpu_core_count    = 2
+  memory_size       = 4
 }
 
 data "huaweicloud_vpc_subnet" "mynet" {

diff --git a/examples/ecs/provisioners/main.tf b/examples/ecs/provisioners/main.tf
@@ -1,9 +1,10 @@
 data "huaweicloud_availability_zones" "myaz" {}
 
 data "huaweicloud_compute_flavors" "myflavor" {
-  performance_type = "normal"
-  cpu_core_count   = 2
-  memory_size      = 4096
+  availability_zone = data.huaweicloud_availability_zones.myaz.names[0]
+  performance_type  = "normal"
+  cpu_core_count    = 2
+  memory_size       = 4
 }
 
 data "huaweicloud_vpc_subnet" "mynet" {

diff --git a/examples/ecs/userdata/main.tf b/examples/ecs/userdata/main.tf
@@ -1,9 +1,10 @@
 data "huaweicloud_availability_zones" "myaz" {}
 
 data "huaweicloud_compute_flavors" "myflavor" {
+  availability_zone = data.huaweicloud_availability_zones.myaz.names[0]
   performance_type = "normal"
   cpu_core_count   = 2
-  memory_size      = 4096
+  memory_size      = 4
 }
 
 data "huaweicloud_vpc_subnet" "mynet" {

diff --git a/huaweicloud/data_source_huaweicloud_compute_flavors.go b/huaweicloud/data_source_huaweicloud_compute_flavors.go
@@ -70,7 +70,7 @@ func dataSourceEcsFlavorsRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	cpu := d.Get("cpu_core_count").(int)
-	mem := int64(d.Get("memory_size").(int))
+	mem := int64(d.Get("memory_size").(int)) * 1024
 	pType := d.Get("performance_type").(string)
 	gen := d.Get("generation").(string)
 	az := d.Get("availability_zone").(string)

diff --git a/huaweicloud/data_source_huaweicloud_compute_flavors_test.go b/huaweicloud/data_source_huaweicloud_compute_flavors_test.go
@@ -42,6 +42,6 @@ const testAccEcsFlavorsDataSource_basic = `
 data "huaweicloud_compute_flavors" "this" {
 	performance_type = "normal"
 	cpu_core_count   = 2
-	memory_size      = 4096
+	memory_size      = 4
 }
 `