You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/12/17 12:04:45 UTC
[4/4] git commit: Update us-west-1 region in the EC2 driver to
include c3 instance types. Also include pricing information.
Update us-west-1 region in the EC2 driver to include c3 instance types.
Also include pricing information.
Reference: https://twitter.com/awscloud/status/412873932828442624
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/0164cc10
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/0164cc10
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/0164cc10
Branch: refs/heads/trunk
Commit: 0164cc107fd24f7d3738390c01dbe0d020e9e6b7
Parents: 2a1ad21
Author: Tomaz Muraus <to...@apache.org>
Authored: Tue Dec 17 11:37:04 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Dec 17 11:37:04 2013 +0100
----------------------------------------------------------------------
CHANGES | 3 +++
libcloud/compute/drivers/ec2.py | 7 ++++++-
libcloud/data/pricing.json | 5 +++++
libcloud/test/compute/test_ec2.py | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/0164cc10/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1751bc3..cb066b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -77,6 +77,9 @@ Changes with Apache Libcloud in development
EC2 driver.
[Tomaz Muraus]
+ - Add c3 instance types to the us-west-1 region in the EC2 driver.
+ [Tomaz Muraus]
+
*) Storage
- Allow user to specify 'Content-Disposition' header in the CloudFiles
http://git-wip-us.apache.org/repos/asf/libcloud/blob/0164cc10/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index a2d148e..b94dbdb 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -251,7 +251,12 @@ REGION_DETAILS = {
'm3.xlarge',
'm3.2xlarge',
'c1.medium',
- 'c1.xlarge'
+ 'c1.xlarge',
+ 'c3.large',
+ 'c3.xlarge',
+ 'c3.2xlarge',
+ 'c3.4xlarge',
+ 'c3.8xlarge'
]
},
'us-west-2': {
http://git-wip-us.apache.org/repos/asf/libcloud/blob/0164cc10/libcloud/data/pricing.json
----------------------------------------------------------------------
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index 564701c..0a4cd97 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -98,6 +98,11 @@
"m1.xlarge": 0.76,
"c1.medium": 0.19,
"c1.xlarge": 0.76,
+ "c3.large": 0.171,
+ "c3.xlarge": 0.342,
+ "c3.2xlarge": 0.633,
+ "c3.4xlarge": 1.366,
+ "c3.8xlarge": 2.732,
"m2.xlarge": 0.57,
"m2.2xlarge": 1.14,
"m2.4xlarge": 2.28,
http://git-wip-us.apache.org/repos/asf/libcloud/blob/0164cc10/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index 4e31803..d4caacc 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -314,7 +314,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
'ap-southeast-2']:
self.assertEqual(len(sizes), 18)
elif region_name == 'us-west-1':
- self.assertEqual(len(sizes), 12)
+ self.assertEqual(len(sizes), 17)
else:
self.assertEqual(len(sizes), 17)