Merge pull request #149 from yunify/fix-router-deleted-test

Fix has been deleted test error
yunify · Jan 23, 2018 · 33984ee · 33984ee
2 parents 993c972 + ff66cb7
commit 33984ee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/qingcloud/resource_qingcloud_vpc.go b/qingcloud/resource_qingcloud_vpc.go
@@ -120,7 +120,7 @@ func resourceQingcloudVpcRead(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	if len(output.RouterSet) == 0 {
+	if isRouterDeleted(output.RouterSet) {
 		d.SetId("")
 		return nil
 	}

diff --git a/qingcloud/resource_qingcloud_vpc_help.go b/qingcloud/resource_qingcloud_vpc_help.go
@@ -90,3 +90,10 @@ func waitRouterLease(d *schema.ResourceData, meta interface{}) error {
 	WaitForLease(output.RouterSet[0].StatusTime)
 	return nil
 }
+
+func isRouterDeleted(routerSet []*qc.Router) bool {
+	if len(routerSet) == 0 || qc.StringValue(routerSet[0].Status) == "deleted" || qc.StringValue(routerSet[0].Status) == "ceased" {
+		return true
+	}
+	return false
+}
diff --git a/qingcloud/resource_qingcloud_vpc_test.go b/qingcloud/resource_qingcloud_vpc_test.go
@@ -244,7 +244,7 @@ func testAccCheckVpcDestroyWithProvider(s *terraform.State, provider *schema.Pro
 		input.Routers = []*string{qc.String(rs.Primary.ID)}
 		output, err := client.router.DescribeRouters(input)
 		if err == nil {
-			if len(output.RouterSet) != 0 && qc.StringValue(output.RouterSet[0].Status) != "deleted" {
+			if !isRouterDeleted(output.RouterSet) {
 				return fmt.Errorf("Found  Router: %s", rs.Primary.ID)
 			}
 		}