Author: tomaz
Date: Sun Jun 26 15:35:59 2011
New Revision: 1139818
URL: http://svn.apache.org/viewvc?rev=1139818&view=rev
Log:
oops, forgot to add this file.
Added:
libcloud/trunk/test/compute/fixtures/ec2/describe_instances_with_tags.xml
Modified:
libcloud/trunk/libcloud/compute/types.py
Modified: libcloud/trunk/libcloud/compute/types.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/types.py?rev=1139818&r1=1139817&r2=1139818&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/types.py (original)
+++ libcloud/trunk/libcloud/compute/types.py Sun Jun 26 15:35:59 2011
@@ -108,6 +108,16 @@ class NodeState(object):
PENDING = 3
UNKNOWN = 4
+class Architecture(object):
+ """
+ Image and size architectures.
+
+ @cvar I386: i386 (32 bt)
+ @cvar X86_64: x86_64 (64 bit)
+ """
+ I386 = 0
+ X86_X64 = 1
+
class DeploymentError(LibcloudError):
"""
Exception used when a Deployment Task failed.
Added: libcloud/trunk/test/compute/fixtures/ec2/describe_instances_with_tags.xml
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/fixtures/ec2/describe_instances_with_tags.xml?rev=1139818&view=auto
==============================================================================
--- libcloud/trunk/test/compute/fixtures/ec2/describe_instances_with_tags.xml
(added)
+++ libcloud/trunk/test/compute/fixtures/ec2/describe_instances_with_tags.xml
Sun Jun 26 15:35:59 2011
@@ -0,0 +1,53 @@
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/";>
+ <requestId>56d0fffa-8819-4658-bdd7-548f143a86d2</requestId>
+ <reservationSet>
+ <item>
+ <reservationId>r-07adf66e</reservationId>
+ <ownerId>822272953071</ownerId>
+ <groupSet>
+ <item>
+ <groupId>default</groupId>
+ </item>
+ </groupSet>
+ <instancesSet>
+ <item>
+ <instanceId>i-8474834a</instanceId>
+ <imageId>ami-0f234b234</imageId>
+ <instanceState>
+ <code>0</code>
+ <name>pending</name>
+ </instanceState>
+ <privateDnsName/>
+ <dnsName/>
+ <reason/>
+ <privateIpAddress>1.2.3.5</privateIpAddress>
+ <ipAddress>1.2.3.5</ipAddress>
+ <amiLaunchIndex>0</amiLaunchIndex>
+ <productCodes/>
+ <instanceType>m1.micro</instanceType>
+ <launchTime>2009-08-07T05:47:04.000Z</launchTime>
+ <placement>
+ <availabilityZone>us-west-1a</availabilityZone>
+ </placement>
+ <monitoring>
+ <state>disabled</state>
+ </monitoring>
+ <tagSet>
+ <item>
+ <key>Name</key>
+ <value>foobar1</value>
+ </item>
+ <item>
+ <key>user_key1</key>
+ <value>user_val1</value>
+ </item>
+ <item>
+ <key>user_key2</key>
+ <value>user_val2</value>
+ </item>
+ </tagSet>
+ </item>
+ </instancesSet>
+ </item>
+ </reservationSet>
+</DescribeInstancesResponse>
