diff --git a/opentelekomcloud/acceptance/cce/resource_opentelekomcloud_cce_node_pool_v3_test.go b/opentelekomcloud/acceptance/cce/resource_opentelekomcloud_cce_node_pool_v3_test.go index 84413ae9c..ace407963 100644 --- a/opentelekomcloud/acceptance/cce/resource_opentelekomcloud_cce_node_pool_v3_test.go +++ b/opentelekomcloud/acceptance/cce/resource_opentelekomcloud_cce_node_pool_v3_test.go @@ -132,7 +132,8 @@ func testAccCheckCCENodePoolV3Exists(n string, cluster string, nodePool *nodepoo } } -var testAccCCENodePoolV3_basic = fmt.Sprintf(` +var ( + testAccCCENodePoolV3_basic = fmt.Sprintf(` resource "opentelekomcloud_cce_cluster_v3" "cluster" { name = "opentelekomcloud-cce-np" cluster_type = "VirtualMachine" @@ -154,10 +155,10 @@ resource "opentelekomcloud_cce_node_pool_v3" "node_pool" { key_pair = "%s" scale_enable = false - min_node_count = 0 - max_node_count = 0 - scale_down_cooldown_time = 0 - priority = 0 + min_node_count = 1 + max_node_count = 3 + scale_down_cooldown_time = 6 + priority = 1 root_volume { size = 40 @@ -173,7 +174,7 @@ resource "opentelekomcloud_cce_node_pool_v3" "node_pool" { } }`, env.OS_VPC_ID, env.OS_NETWORK_ID, env.OS_AVAILABILITY_ZONE, env.OS_KEYPAIR_NAME) -var testAccCCENodePoolV3_update = fmt.Sprintf(` + testAccCCENodePoolV3_update = fmt.Sprintf(` resource "opentelekomcloud_cce_cluster_v3" "cluster" { name = "opentelekomcloud-cce-np" cluster_type = "VirtualMachine" @@ -214,7 +215,7 @@ resource "opentelekomcloud_cce_node_pool_v3" "node_pool" { } }`, env.OS_VPC_ID, env.OS_NETWORK_ID, env.OS_AVAILABILITY_ZONE, env.OS_KEYPAIR_NAME) -var testAccCCENodePoolV3_RandomAZ = fmt.Sprintf(` + testAccCCENodePoolV3_RandomAZ = fmt.Sprintf(` resource "opentelekomcloud_cce_cluster_v3" "cluster" { name = "opentelekomcloud-cce-np" cluster_type = "VirtualMachine" @@ -250,3 +251,4 @@ resource "opentelekomcloud_cce_node_pool_v3" "node_pool" { volumetype = "SSD" } }`, env.OS_VPC_ID, env.OS_NETWORK_ID, env.OS_KEYPAIR_NAME) +) diff --git a/opentelekomcloud/services/cce/resource_opentelekomcloud_cce_node_pool_v3.go b/opentelekomcloud/services/cce/resource_opentelekomcloud_cce_node_pool_v3.go index 54a7d756c..21a50adf5 100644 --- a/opentelekomcloud/services/cce/resource_opentelekomcloud_cce_node_pool_v3.go +++ b/opentelekomcloud/services/cce/resource_opentelekomcloud_cce_node_pool_v3.go @@ -360,7 +360,7 @@ func resourceCCENodePoolV3Read(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error retrieving Open Telekom Cloud CCE Node Pool: %s", err) } - me := multierror.Append(nil, + me := multierror.Append( d.Set("name", s.Metadata.Name), d.Set("flavor", s.Spec.NodeTemplate.Flavor), d.Set("availability_zone", s.Spec.NodeTemplate.Az), @@ -368,11 +368,17 @@ func resourceCCENodePoolV3Read(d *schema.ResourceData, meta interface{}) error { d.Set("key_pair", s.Spec.NodeTemplate.Login.SshKey), d.Set("initial_node_count", s.Spec.InitialNodeCount), d.Set("scale_enable", s.Spec.Autoscaling.Enable), - d.Set("min_node_count", s.Spec.Autoscaling.MinNodeCount), - d.Set("max_node_count", s.Spec.Autoscaling.MaxNodeCount), - d.Set("scale_down_cooldown_time", s.Spec.Autoscaling.ScaleDownCooldownTime), - d.Set("priority", s.Spec.Autoscaling.Priority), ) + + if s.Spec.Autoscaling.Enable { + me = multierror.Append(me, + d.Set("min_node_count", s.Spec.Autoscaling.MinNodeCount), + d.Set("max_node_count", s.Spec.Autoscaling.MaxNodeCount), + d.Set("scale_down_cooldown_time", s.Spec.Autoscaling.ScaleDownCooldownTime), + d.Set("priority", s.Spec.Autoscaling.Priority), + ) + } + if err := me.ErrorOrNil(); err != nil { return fmt.Errorf("error setting CCE Node Pool attributes (%s): %s", d.Id(), err) }