From 22d9ccaae3c07e13bba619309eef102f68c8aab3 Mon Sep 17 00:00:00 2001 From: runzexia Date: Fri, 22 Dec 2017 13:27:46 +0800 Subject: [PATCH] wait use ceate finshed time --- qingcloud/resource_qingcloud_eip_help.go | 5 ++++- qingcloud/resource_qingcloud_instance_help.go | 5 ++++- qingcloud/resource_qingcloud_loadbalancer_help.go | 3 +++ qingcloud/resource_qingcloud_volume_help.go | 5 ++++- qingcloud/resource_qingcloud_vpc_help.go | 3 +++ 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/qingcloud/resource_qingcloud_eip_help.go b/qingcloud/resource_qingcloud_eip_help.go index 20223197b..aaf154861 100644 --- a/qingcloud/resource_qingcloud_eip_help.go +++ b/qingcloud/resource_qingcloud_eip_help.go @@ -90,6 +90,9 @@ func getEIPResourceMap(data *qc.EIP) map[string]interface{} { return a } func waitEipLease(d *schema.ResourceData, meta interface{}) error { + if !d.IsNewResource() { + return nil + } clt := meta.(*QingCloudClient).eip input := new(qc.DescribeEIPsInput) input.EIPs = []*string{qc.String(d.Id())} @@ -104,7 +107,7 @@ func waitEipLease(d *schema.ResourceData, meta interface{}) error { return err } //wait for lease info - WaitForLease(output.EIPSet[0].CreateTime) + WaitForLease(output.EIPSet[0].StatusTime) return nil } diff --git a/qingcloud/resource_qingcloud_instance_help.go b/qingcloud/resource_qingcloud_instance_help.go index 55b804bbf..7273de71c 100644 --- a/qingcloud/resource_qingcloud_instance_help.go +++ b/qingcloud/resource_qingcloud_instance_help.go @@ -396,6 +396,9 @@ func updateInstanceVolume(d *schema.ResourceData, meta interface{}) error { } func waitInstanceLease(d *schema.ResourceData, meta interface{}) error { + if !d.IsNewResource() { + return nil + } clt := meta.(*QingCloudClient).instance input := new(qc.DescribeInstancesInput) input.Instances = []*string{qc.String(d.Id())} @@ -410,7 +413,7 @@ func waitInstanceLease(d *schema.ResourceData, meta interface{}) error { return err } //wait for lease info - WaitForLease(output.InstanceSet[0].CreateTime) + WaitForLease(output.InstanceSet[0].StatusTime) return nil } diff --git a/qingcloud/resource_qingcloud_loadbalancer_help.go b/qingcloud/resource_qingcloud_loadbalancer_help.go index 80f8b9edd..c018ca25d 100644 --- a/qingcloud/resource_qingcloud_loadbalancer_help.go +++ b/qingcloud/resource_qingcloud_loadbalancer_help.go @@ -180,6 +180,9 @@ func isLoadBalancerDeleted(lbSet []*qc.LoadBalancer) bool { } func waitLoadBalancerLease(d *schema.ResourceData, meta interface{}) error { + if !d.IsNewResource() { + return nil + } clt := meta.(*QingCloudClient).loadbalancer input := new(qc.DescribeLoadBalancersInput) input.LoadBalancers = []*string{qc.String(d.Id())} diff --git a/qingcloud/resource_qingcloud_volume_help.go b/qingcloud/resource_qingcloud_volume_help.go index e5e24abfb..41ebe3a64 100644 --- a/qingcloud/resource_qingcloud_volume_help.go +++ b/qingcloud/resource_qingcloud_volume_help.go @@ -83,6 +83,9 @@ func changeVolumeSize(d *schema.ResourceData, meta interface{}) error { } func waitVolumeLease(d *schema.ResourceData, meta interface{}) error { + if !d.IsNewResource() { + return nil + } clt := meta.(*QingCloudClient).volume input := new(qc.DescribeVolumesInput) input.Volumes = []*string{qc.String(d.Id())} @@ -97,6 +100,6 @@ func waitVolumeLease(d *schema.ResourceData, meta interface{}) error { return err } //wait for lease info - WaitForLease(output.VolumeSet[0].CreateTime) + WaitForLease(output.VolumeSet[0].StatusTime) return nil } diff --git a/qingcloud/resource_qingcloud_vpc_help.go b/qingcloud/resource_qingcloud_vpc_help.go index 60355fe5d..07ca90d30 100644 --- a/qingcloud/resource_qingcloud_vpc_help.go +++ b/qingcloud/resource_qingcloud_vpc_help.go @@ -70,6 +70,9 @@ func applyRouterUpdate(routerId *string, meta interface{}) error { } func waitRouterLease(d *schema.ResourceData, meta interface{}) error { + if !d.IsNewResource() { + return nil + } clt := meta.(*QingCloudClient).router input := new(qc.DescribeRoutersInput) input.Routers = []*string{qc.String(d.Id())}