Reviewers: mp+129325_code.launchpad.net,

Message:
Please take a look.

Description:




https://code.launchpad.net/~mirtchovski/goamz/ec2/+merge/129325

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/6745044/

Affected files:
   A [revision details]
   M ec2/ec2i_test.go


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: ec2/ec2i_test.go
=== modified file 'ec2/ec2i_test.go'
--- ec2/ec2i_test.go	2012-10-17 22:47:42 +0000
+++ ec2/ec2i_test.go	2012-10-18 19:44:38 +0000
@@ -203,3 +203,72 @@
  		}
  	}
  }
+
+// Cost: unknown
+func (s *ClientTests) TestImages(c *C) {
+	filter := ec2.NewFilter()
+	filter.Add("architecture", "i386")
+	filter.Add("image-type", "machine")
+	filter.Add("description", "http://bitnami.org")
+	filter.Add("is-public", "true")
+
+	id := []string{"ami-fd20ff94"}
+
+	resp1, err := s.ec2.Images(id, filter)
+	c.Assert(err, IsNil)
+
+	i0 := resp1.Images[0]
+	c.Check(i0.Id, Equals, "ami-fd20ff94")
+	c.Check(i0.Name,  
Equals, "bitnami-webpack-1.0-0-linux-ubuntu-10.04.3-i386-mp-0b295d82-395d-4b81-89df-5ac5f0b66975-ami-3820fc51.1")
+	c.Check(i0.Description, Equals, "http://bitnami.org")
+	c.Check(i0.Type, Equals, "machine")
+	c.Check(i0.State, Equals, "available")
+	c.Check(i0.Location,  
Equals, "aws-marketplace/bitnami-webpack-1.0-0-linux-ubuntu-10.04.3-i386-mp-0b295d82-395d-4b81-89df-5ac5f0b66975-ami-3820fc51.1")
+	c.Check(i0.Public, Equals, true)
+	c.Check(i0.Architecture, Equals, "i386")
+	c.Check(i0.Platform, Equals, "")
+	c.Check(i0.ProductCodes, HasLen, 0)
+	c.Check(i0.KernelId, Equals, "i386")
+	c.Check(i0.RamdiskId, Equals, "")
+	c.Check(i0.StateReason, Equals, "")
+	c.Check(i0.OwnerId, Equals, "679593333241")
+	c.Check(i0.OwnerAlias, Equals, "aws-marketplace")
+	c.Check(i0.RootDeviceType, Equals, "ebs")
+	c.Check(i0.RootDeviceName, Equals, "/dev/sda1")
+	c.Check(i0.VirtualizationType, Equals, "paravirtual")
+	c.Check(i0.Hypervisor, Equals, "xen")
+
+	c.Assert(i0.BlockDevices, HasLen, 1)
+	c.Assert(i0.BlockDevices[0].DeviceName, Equals, "/dev/sda1")
+	c.Assert(i0.BlockDevices[0].SnapshotId, Equals, "snap-5d581d27")
+	c.Assert(i0.BlockDevices[0].VolumeSize, Equals, int64(10))
+	c.Assert(i0.BlockDevices[0].DeleteOnTermination, Equals, true)
+	c.Assert(i0.BlockDevices[0].VolumeType, Equals, "")
+	c.Assert(i0.BlockDevices[0].IOPS, Equals, int64(0))
+}
+
+// Cost: unknown
+func (s *ClientTests) TestSnapshots(c *C) {
+	filter := ec2.NewFilter()
+	filter.Add("volume-id", "vol-37ac485e")
+	filter.Add("status", "completed")
+	filter.Add("start-time", "2008-11-19T10:03:00.000Z")
+
+	id := []string{"snap-9df717f4"}
+
+	resp, err := s.ec2.Snapshots(id, filter)
+	c.Assert(err, IsNil)
+	c.Check(resp.Snapshots, HasLen, 1)
+	
+	s0 := resp.Snapshots[0]
+	c.Check(s0.Id, Equals, "snap-9df717f4")
+	c.Check(s0.VolumeId, Equals, "vol-37ac485e")
+	c.Check(s0.Status, Equals, "completed")
+	c.Check(s0.StartTime, Equals, "2008-11-19T10:03:00.000Z")
+	c.Check(s0.Progress, Equals, "100%")
+	c.Check(s0.OwnerId, Equals, "947081328633")
+	c.Check(s0.VolumeSize, Equals, "2")
+	c.Check(s0.Description, Equals, "1980 US Census (Linux)")
+	c.Check(s0.OwnerAlias, Equals, "amazon")
+	c.Check(s0.Tags, HasLen, 0)
+}