libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r1441704 - in /libcloud/trunk: CHANGES libcloud/compute/drivers/ec2.py libcloud/data/pricing.json libcloud/test/compute/test_ec2.py
Date Sat, 02 Feb 2013 06:03:48 GMT
Author: tomaz
Date: Sat Feb  2 06:03:48 2013
New Revision: 1441704

URL: http://svn.apache.org/viewvc?rev=1441704&view=rev
Log:
Update EC2 driver, m3 instance types are now available in all the regions
except Brazil.

Also update pricing to reflect new (decreased) prices.

Modified:
    libcloud/trunk/CHANGES
    libcloud/trunk/libcloud/compute/drivers/ec2.py
    libcloud/trunk/libcloud/data/pricing.json
    libcloud/trunk/libcloud/test/compute/test_ec2.py

Modified: libcloud/trunk/CHANGES
URL: http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1441704&r1=1441703&r2=1441704&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Sat Feb  2 06:03:48 2013
@@ -127,6 +127,12 @@ Changes with Apache Libcloud in developm
      (LIBCLOUD-287)
      [Kevin McDonald]
 
+   - Update EC2 driver, m3 instance types are now available in all the regions
+     except Brazil.
+
+     Also update pricing to reflect new (decreased) prices.
+     [Tomaz Muraus]
+
   *) Storage
 
     - Add a new local storage driver.

Modified: libcloud/trunk/libcloud/compute/drivers/ec2.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/ec2.py?rev=1441704&r1=1441703&r2=1441704&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ec2.py Sat Feb  2 06:03:48 2013
@@ -204,6 +204,8 @@ REGION_DETAILS = {
             'm2.xlarge',
             'm2.2xlarge',
             'm2.4xlarge',
+            'm3.xlarge',
+            'm3.2xlarge',
             'c1.medium',
             'c1.xlarge'
         ]
@@ -239,6 +241,8 @@ REGION_DETAILS = {
             'm2.xlarge',
             'm2.2xlarge',
             'm2.4xlarge',
+            'm3.xlarge',
+            'm3.2xlarge',
             'c1.medium',
             'c1.xlarge',
             'cc2.8xlarge'
@@ -257,6 +261,8 @@ REGION_DETAILS = {
             'm2.xlarge',
             'm2.2xlarge',
             'm2.4xlarge',
+            'm3.xlarge',
+            'm3.2xlarge',
             'c1.medium',
             'c1.xlarge'
         ]
@@ -274,6 +280,8 @@ REGION_DETAILS = {
             'm2.xlarge',
             'm2.2xlarge',
             'm2.4xlarge',
+            'm3.xlarge',
+            'm3.2xlarge',
             'c1.medium',
             'c1.xlarge'
         ]
@@ -309,6 +317,8 @@ REGION_DETAILS = {
             'm2.xlarge',
             'm2.2xlarge',
             'm2.4xlarge',
+            'm3.xlarge',
+            'm3.2xlarge',
             'c1.medium',
             'c1.xlarge'
         ]

Modified: libcloud/trunk/libcloud/data/pricing.json
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/data/pricing.json?rev=1441704&r1=1441703&r2=1441704&view=diff
==============================================================================
--- libcloud/trunk/libcloud/data/pricing.json (original)
+++ libcloud/trunk/libcloud/data/pricing.json Sat Feb  2 06:03:48 2013
@@ -57,8 +57,8 @@
             "m2.xlarge": 0.50,
             "m2.2xlarge": 1.0,
             "m2.4xlarge": 2.0,
-            "m3.xlarge": 0.58,
-            "m3.2xlarge": 1.16,
+            "m3.xlarge": 0.50,
+            "m3.2xlarge": 1.00,
             "cg1.4xlarge": 2.1,
             "cc1.4xlarge": 1.3,
             "cc2.8xlarge": 2.4,
@@ -76,7 +76,9 @@
             "c1.xlarge": 0.76,
             "m2.xlarge": 0.57,
             "m2.2xlarge": 1.14,
-            "m2.4xlarge": 2.28
+            "m2.4xlarge": 2.28,
+            "m3.xlarge": 0.55,
+            "m3.2xlarge": 1.10
         },
 
         "ec2_us_west_oregon": {
@@ -90,6 +92,8 @@
             "m2.xlarge": 0.50,
             "m2.2xlarge": 1.0,
             "m2.4xlarge": 2.0,
+            "m3.xlarge": 0.50,
+            "m3.2xlarge": 1.00,
             "cc2.8xlarge": 2.400
         },
 
@@ -104,6 +108,8 @@
             "m2.xlarge": 0.57,
             "m2.2xlarge": 1.14,
             "m2.4xlarge": 2.28,
+            "m3.xlarge": 0.55,
+            "m3.2xlarge": 1.10,
             "cc2.8xlarge": 2.7
         },
 
@@ -117,7 +123,9 @@
             "c1.xlarge": 0.76,
             "m2.xlarge": 0.57,
             "m2.2xlarge": 1.14,
-            "m2.4xlarge": 2.28
+            "m2.4xlarge": 2.28,
+            "m3.xlarge": 0.70,
+            "m3.2xlarge": 1.40
         },
 
        "ec2_ap_northeast": {
@@ -130,7 +138,9 @@
             "c1.xlarge": 0.80,
             "m2.xlarge": 0.60,
             "m2.2xlarge": 1.20,
-            "m2.4xlarge": 2.39
+            "m2.4xlarge": 2.39,
+            "m3.xlarge": 0.76,
+            "m3.2xlarge": 1.52
        },
 
         "ec2_sa_east": {
@@ -156,7 +166,9 @@
             "c1.xlarge": 0.744,
             "m2.xlarge": 0.506,
             "m2.2xlarge": 1.012,
-            "m2.4xlarge": 2.024
+            "m2.4xlarge": 2.024,
+            "m3.xlarge": 0.70,
+            "m3.2xlarge": 1.40
         },
 
         "nimbus" : {

Modified: libcloud/trunk/libcloud/test/compute/test_ec2.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_ec2.py?rev=1441704&r1=1441703&r2=1441704&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_ec2.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_ec2.py Sat Feb  2 06:03:48 2013
@@ -252,9 +252,9 @@ class EC2Tests(LibcloudTestCase, TestCas
                 self.assertTrue('cc2.8xlarge' in ids)
                 self.assertTrue('cr1.8xlarge' in ids)
             elif region_name == 'eu-west-1':
-                self.assertEqual(len(sizes), 11)
+                self.assertEqual(len(sizes), 13)
             else:
-                self.assertEqual(len(sizes), 10)
+                self.assertEqual(len(sizes), 12)
 
         self.driver.region_name = region_old
 



Mime
View raw message