← Back to branch summary

~tribaal/txaws/xss-hardening

« back to all changes in this revision

Viewing changes to txaws/testing/ec2.py

  • Committer: Duncan McGreggor
  • Date: 2009-10-06 00:14:10 UTC
  • mto: This revision was merged to the branch mainline in revision 35.
  • Revision ID: duncan@canonical.com-20091006001410-5dafos89jw2nbrbq
Added testing infratructure support for availability zones.

Show diffs side-by-side

added added

removed removed

Lines of Context:
txaws/testing/ec2.py
14
14
 
15
15
    def __init__(self, creds, endpoint, instances=None, keypairs=None,
16
16
                 volumes=None, key_material="", security_groups=None,
17
 
                 snapshots=None):
 
17
                 snapshots=None, availability_zones=None):
18
18
        self.creds = creds
19
19
        self.endpoint = endpoint
20
20
        self.instances = instances or []
27
27
        self.security_groups_deleted = []
28
28
        self.snapshots = snapshots or []
29
29
        self.snapshots_deleted = []
 
30
        self.availability_zones = availability_zones or []
30
31
 
31
32
    def describe_instances(self):
32
33
        return succeed(self.instances)
93
94
                             cidr_ip):
94
95
        return succeed(True)
95
96
 
 
97
    def describe_availability_zones(self, *names):
 
98
        return succeed(self.availability_zones)
 
99
 
96
100
 
97
101
class FakePageGetter(object):
98
102