ec2: Add support for VPC subnets

ec2/vpc_test.go

 //
 // goamz - Go packages to interact with the Amazon Web Services.
 //
 //   https://wiki.ubuntu.com/goamz
 //
 // Copyright (c) 2014 Canonical Ltd.
 //
 
 package ec2_test
 
@@ skipping 129 matching lines @@
         c.Assert(err, IsNil)
         c.Assert(list.VPCs, HasLen, 1)
         assertVPC(c, list.VPCs[0], id2, resp2.VPC.CIDRBlock)
 
         _, err = s.ec2.DeleteVPC(id1)
         c.Assert(err, IsNil)
         _, err = s.ec2.DeleteVPC(id2)
         c.Assert(err, IsNil)
 }
 
+// deleteVPCs ensures the given VPCs are deleted, by retrying until a
+// timeout or all VPC cannot be found anymore.  This should be used to
+// make sure tests leave no VPCs around.
+func (s *ServerTests) deleteVPCs(c *C, ids []string) {
+        testAttempt := aws.AttemptStrategy{
+                Total: 2 * time.Minute,
+                Delay: 5 * time.Second,
+        }
+        for a := testAttempt.Start(); a.Next(); {
+                deleted := 0
+                c.Logf("deleting VPCs %v", ids)
+                for _, id := range ids {
+                        _, err := s.ec2.DeleteVPC(id)
+                        if err == nil || errorCode(err) == "InvalidVpcID.NotFound" {
+                                c.Logf("VPC %s deleted", id)
+                                deleted++
+                                continue
+                        }
+                        if err != nil {
+                                c.Logf("retrying; DeleteVPC returned: %v", err)
+                        }
+                }
+                if deleted == len(ids) {
+                        c.Logf("all VPCs deleted")
+                        return
+                }
+        }
+        c.Fatalf("timeout while waiting %v VPCs to get deleted!", ids)
+}
+
 func assertVPC(c *C, obtained ec2.VPC, expectId, expectCidr string) {
         if expectId != "" {
                 c.Check(obtained.Id, Equals, expectId)
         } else {
                 c.Check(obtained.Id, Matches, `^vpc-[0-9a-f]+$`)
         }
         c.Check(obtained.State, Matches, "(available|pending)")
         if expectCidr != "" {
                 c.Check(obtained.CIDRBlock, Equals, expectCidr)
         } else {
                 c.Check(obtained.CIDRBlock, Matches, `^\d+\.\d+\.\d+\.\d+/\d+$`)
         }
         c.Check(obtained.DHCPOptionsId, Matches, `^dopt-[0-9a-f]+$`)
         c.Check(obtained.IsDefault, Equals, false)
         c.Check(obtained.Tags, HasLen, 0)
         c.Check(obtained.InstanceTenancy, Matches, "(default|dedicated)")
 }