Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: boto/vpc/subnet.py

Issue 8386013: Merging in latest boto. (Closed) Base URL: svn://svn.chromium.org/boto
Patch Set: Redoing vendor drop by deleting and then merging. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « boto/vpc/routetable.py ('k') | docs/source/autoscale_tut.rst » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009-2010 Mitch Garnaat http://garnaat.org/ 1 # Copyright (c) 2009-2010 Mitch Garnaat http://garnaat.org/
2 # 2 #
3 # Permission is hereby granted, free of charge, to any person obtaining a 3 # Permission is hereby granted, free of charge, to any person obtaining a
4 # copy of this software and associated documentation files (the 4 # copy of this software and associated documentation files (the
5 # "Software"), to deal in the Software without restriction, including 5 # "Software"), to deal in the Software without restriction, including
6 # without limitation the rights to use, copy, modify, merge, publish, dis- 6 # without limitation the rights to use, copy, modify, merge, publish, dis-
7 # tribute, sublicense, and/or sell copies of the Software, and to permit 7 # tribute, sublicense, and/or sell copies of the Software, and to permit
8 # persons to whom the Software is furnished to do so, subject to the fol- 8 # persons to whom the Software is furnished to do so, subject to the fol-
9 # lowing conditions: 9 # lowing conditions:
10 # 10 #
11 # The above copyright notice and this permission notice shall be included 11 # The above copyright notice and this permission notice shall be included
12 # in all copies or substantial portions of the Software. 12 # in all copies or substantial portions of the Software.
13 # 13 #
14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- 15 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
16 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT 16 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
17 # SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 17 # SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
18 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 18 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 19 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
20 # IN THE SOFTWARE. 20 # IN THE SOFTWARE.
21 21
22 """ 22 """
23 Represents a Subnet 23 Represents a Subnet
24 """ 24 """
25 25
26 from boto.ec2.ec2object import TaggedEC2Object 26 from boto.ec2.ec2object import TaggedEC2Object
27 27
28 class Subnet(TaggedEC2Object): 28 class Subnet(TaggedEC2Object):
29 29
30 def __init__(self, connection=None): 30 def __init__(self, connection=None):
31 TaggedEC2Object.__init__(self, connection) 31 TaggedEC2Object.__init__(self, connection)
32 self.id = None 32 self.id = None
33 self.vpc_id = None
33 self.state = None 34 self.state = None
34 self.cidr_block = None 35 self.cidr_block = None
35 self.available_ip_address_count = 0 36 self.available_ip_address_count = 0
36 self.availability_zone = None 37 self.availability_zone = None
37 38
38 def __repr__(self): 39 def __repr__(self):
39 return 'Subnet:%s' % self.id 40 return 'Subnet:%s' % self.id
40 41
41 def endElement(self, name, value, connection): 42 def endElement(self, name, value, connection):
42 if name == 'subnetId': 43 if name == 'subnetId':
43 self.id = value 44 self.id = value
45 elif name == 'vpcId':
46 self.vpc_id = value
44 elif name == 'state': 47 elif name == 'state':
45 self.state = value 48 self.state = value
46 elif name == 'cidrBlock': 49 elif name == 'cidrBlock':
47 self.cidr_block = value 50 self.cidr_block = value
48 elif name == 'availableIpAddressCount': 51 elif name == 'availableIpAddressCount':
49 self.available_ip_address_count = int(value) 52 self.available_ip_address_count = int(value)
50 elif name == 'availabilityZone': 53 elif name == 'availabilityZone':
51 self.availability_zone = value 54 self.availability_zone = value
52 else: 55 else:
53 setattr(self, name, value) 56 setattr(self, name, value)
54 57
OLDNEW
« no previous file with comments | « boto/vpc/routetable.py ('k') | docs/source/autoscale_tut.rst » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698