Author: tomaz
Date: Thu Mar 8 18:45:19 2012
New Revision: 1298501
URL: http://svn.apache.org/viewvc?rev=1298501&view=rev
Log:
Add new Amazon instance type - m1.medium.
Modified:
libcloud/trunk/CHANGES
libcloud/trunk/libcloud/compute/drivers/ec2.py
libcloud/trunk/libcloud/data/pricing.json
libcloud/trunk/test/compute/test_ec2.py
Modified: libcloud/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1298501&r1=1298500&r2=1298501&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Thu Mar 8 18:45:19 2012
@@ -50,6 +50,9 @@ Changes with Apache Libcloud in developm
OpenStack driver.
[Mark Everett]
+ - Add new EC2 instance type - m1.medium.
+ [Tomaz Muraus]
+
*) Storage:
- Don't lowercase special header names in the Amazon S3 storage driver. ;
Modified: libcloud/trunk/libcloud/compute/drivers/ec2.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/ec2.py?rev=1298501&r1=1298500&r2=1298501&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ec2.py Thu Mar 8 18:45:19 2012
@@ -72,6 +72,13 @@ EC2_INSTANCE_TYPES = {
'disk': 160,
'bandwidth': None
},
+ 'm1.medium': {
+ 'id': 'm1.medium',
+ 'name': 'Medium Instance',
+ 'ram': 3700,
+ 'disk': 410,
+ 'bandwidth': None
+ },
'm1.large': {
'id': 'm1.large',
'name': 'Large Instance',
Modified: libcloud/trunk/libcloud/data/pricing.json
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/data/pricing.json?rev=1298501&r1=1298500&r2=1298501&view=diff
==============================================================================
--- libcloud/trunk/libcloud/data/pricing.json (original)
+++ libcloud/trunk/libcloud/data/pricing.json Thu Mar 8 18:45:19 2012
@@ -29,6 +29,7 @@
"ec2_us_east": {
"t1.micro": 0.02,
"m1.small": 0.085,
+ "m1.medium": 0.160,
"m1.large": 0.34,
"m1.xlarge": 0.68,
"c1.medium": 0.17,
@@ -44,6 +45,7 @@
"ec2_us_west": {
"t1.micro": 0.025,
"m1.small": 0.095,
+ "m1.medium": 0.180,
"m1.large": 0.38,
"m1.xlarge": 0.76,
"c1.medium": 0.19,
@@ -56,6 +58,7 @@
"ec2_us_west_oregon": {
"t1.micro": 0.02,
"m1.small": 0.085,
+ "m1.medium": 0.160,
"m1.large": 0.34,
"m1.xlarge": 0.68,
"c1.medium": 0.17,
@@ -68,6 +71,7 @@
"ec2_eu_west": {
"t1.micro": 0.025,
"m1.small": 0.095,
+ "m1.medium": 0.180,
"m1.large": 0.38,
"m1.xlarge": 0.76,
"c1.medium": 0.19,
@@ -80,6 +84,7 @@
"ec2_ap_southeast": {
"t1.micro": 0.025,
"m1.small": 0.095,
+ "m1.medium": 0.180,
"m1.large": 0.38,
"m1.xlarge": 0.76,
"c1.medium": 0.19,
@@ -92,6 +97,7 @@
"ec2_ap_northeast": {
"t1.micro": 0.027,
"m1.small": 0.10,
+ "m1.medium": 0.184,
"m1.large": 0.40,
"m1.xlarge": 0.80,
"c1.medium": 0.20,
@@ -104,6 +110,7 @@
"ec2_sa_east": {
"t1.micro": 0.027,
"m1.small": 0.115,
+ "m1.medium": 0.230,
"m1.large": 0.46,
"m1.xlarge": 0.92,
"c1.medium": 0.23,
Modified: libcloud/trunk/test/compute/test_ec2.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_ec2.py?rev=1298501&r1=1298500&r2=1298501&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_ec2.py (original)
+++ libcloud/trunk/test/compute/test_ec2.py Thu Mar 8 18:45:19 2012
@@ -184,12 +184,12 @@ class EC2Tests(LibcloudTestCase, TestCas
self.assertTrue('m2.4xlarge' in ids)
if region_name == 'us-east-1':
- self.assertEqual(len(sizes), 12)
+ self.assertEqual(len(sizes), 13)
self.assertTrue('cg1.4xlarge' in ids)
self.assertTrue('cc1.4xlarge' in ids)
self.assertTrue('cc2.8xlarge' in ids)
else:
- self.assertEqual(len(sizes), 9)
+ self.assertEqual(len(sizes), 10)
self.driver.region_name = region_old
