Index: txaws/ec2/tests/test_client.py |
=== modified file 'txaws/ec2/tests/test_client.py' |
--- txaws/ec2/tests/test_client.py 2012-03-02 22:00:10 +0000 |
+++ txaws/ec2/tests/test_client.py 2012-11-08 19:20:49 +0000 |
@@ -400,6 +400,7 @@ |
def check_results(security_groups): |
[security_group] = security_groups |
+ self.assertEquals(security_group.id, "sg-a1a1a1") |
self.assertEquals(security_group.owner_id, |
"UYY3TLBUXIEON5NQVUUX6OMPWBZIQNFM") |
self.assertEquals(security_group.name, "WebServers") |
@@ -440,6 +441,7 @@ |
security_group = security_groups[0] |
self.assertEquals(security_group.owner_id, |
"UYY3TLBUXIEON5NQVUUX6OMPWBZIQNFM") |
+ self.assertEquals(security_group.id, "sg-a1a1a1") |
self.assertEquals(security_group.name, "MessageServers") |
self.assertEquals(security_group.description, "Message Servers") |
self.assertEquals(security_group.allowed_groups, []) |
@@ -451,6 +453,7 @@ |
security_group = security_groups[1] |
self.assertEquals(security_group.owner_id, |
"UYY3TLBUXIEON5NQVUUX6OMPWBZIQNFM") |
+ self.assertEquals(security_group.id, "sg-c3c3c3") |
self.assertEquals(security_group.name, "WebServers") |
self.assertEquals(security_group.description, "Web Servers") |
self.assertEquals([(pair.user_id, pair.group_name) |
@@ -583,14 +586,45 @@ |
def submit(self): |
return succeed(payload.sample_create_security_group) |
+ def check_result(id): |
+ self.assertEquals(id, "sg-1a2b3c4d") |
+ |
creds = AWSCredentials("foo", "bar") |
ec2 = client.EC2Client(creds, query_factory=StubQuery) |
d = ec2.create_security_group( |
"WebServers", |
"The group for the web server farm.") |
- return self.assertTrue(d) |
- |
- def test_delete_security_group(self): |
+ return d.addCallback(check_result) |
+ |
+ def test_create_security_group_with_VPC(self): |
+ class StubQuery(object): |
+ |
+ def __init__(stub, action="", creds=None, endpoint=None, |
+ other_params={}): |
+ self.assertEqual(action, "CreateSecurityGroup") |
+ self.assertEqual(creds.access_key, "foo") |
+ self.assertEqual(creds.secret_key, "bar") |
+ self.assertEqual(other_params, { |
+ "GroupName": "WebServers", |
+ "GroupDescription": "The group for the web server farm.", |
+ "VpcId": "vpc-a4f2", |
+ }) |
+ |
+ def submit(self): |
+ return succeed(payload.sample_create_security_group) |
+ |
+ def check_result(id): |
+ self.assertEquals(id, "sg-1a2b3c4d") |
+ |
+ creds = AWSCredentials("foo", "bar") |
+ ec2 = client.EC2Client(creds, query_factory=StubQuery) |
+ d = ec2.create_security_group( |
+ "WebServers", |
+ "The group for the web server farm.", |
+ "vpc-a4f2") |
+ return d.addCallback(check_result) |
+ |
+ def test_delete_security_group_using_name(self): |
""" |
L{EC2Client.delete_security_group} returns a C{Deferred} that |
eventually fires with a true value, indicating the success of the |
@@ -615,6 +649,40 @@ |
d = ec2.delete_security_group("WebServers") |
return self.assertTrue(d) |
+ def test_delete_security_group_using_id(self): |
+ """ |
+ L{EC2Client.delete_security_group} returns a C{Deferred} that |
+ eventually fires with a true value, indicating the success of the |
+ operation. |
+ """ |
+ class StubQuery(object): |
+ |
+ def __init__(stub, action="", creds=None, endpoint=None, |
+ other_params={}): |
+ self.assertEqual(action, "DeleteSecurityGroup") |
+ self.assertEqual(creds.access_key, "foo") |
+ self.assertEqual(creds.secret_key, "bar") |
+ self.assertEqual(other_params, { |
+ "GroupId": "sg-a1a1a1", |
+ }) |
+ |
+ def submit(self): |
+ return succeed(payload.sample_delete_security_group) |
+ |
+ creds = AWSCredentials("foo", "bar") |
+ ec2 = client.EC2Client(creds, query_factory=StubQuery) |
+ d = ec2.delete_security_group(id="sg-a1a1a1") |
+ return self.assertTrue(d) |
+ |
+ def test_delete_security_group_without_id_and_name(self): |
+ creds = AWSCredentials("foo", "bar") |
+ ec2 = client.EC2Client(creds) |
+ error = self.assertRaises(ValueError, ec2.delete_security_group) |
+ self.assertEquals( |
+ str(error), |
+ "You must provide either the security group name or id", |
+ ) |
+ |
def test_delete_security_group_failure(self): |
""" |
L{EC2Client.delete_security_group} returns a C{Deferred} that |