svn commit: r1426894 - in /libcloud/trunk: CHANGES libcloud/compute/drivers/ec2.py libcloud/data/pricing.json libcloud/test/compute/test_ec2.py

[to...@apache.org]

Author: tomaz
Date: Sun Dec 30 06:04:37 2012
New Revision: 1426894

URL: http://svn.apache.org/viewvc?rev=1426894&view=rev
Log:
Add new EC2 instance type - High Storage Eight Extra Large Instance
(hs1.8xlarge).

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=1426894&r1=1426893&r2=1426894&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Sun Dec 30 06:04:37 2012
@@ -81,6 +81,10 @@ Changes with Apache Libcloud in developm
      anymore.
      [Rick Copeland, Tomaz Muraus]
 
+    - Add new EC2 instance type - High Storage Eight Extra Large Instance
+      (hs1.8xlarge).
+      [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=1426894&r1=1426893&r2=1426894&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ec2.py Sun Dec 30 06:04:37 2012
@@ -154,6 +154,13 @@ INSTANCE_TYPES = {
         'ram': 63488,
         'disk': 3370,
         'bandwidth': None
+    },
+    'hs1.8xlarge': {
+        'id': 'hs1.8xlarge',
+        'name': 'High Storage Eight Extra Large Instance',
+        'ram': 119808,
+        'disk': 48000,
+        'bandwidth': None
     }
 }
 
@@ -177,7 +184,8 @@ REGION_DETAILS = {
             'c1.xlarge',
             'cc1.4xlarge',
             'cc2.8xlarge',
-            'cg1.4xlarge'
+            'cg1.4xlarge',
+            'hs1.8xlarge'
         ]
     },
     'us-west-1': {

Modified: libcloud/trunk/libcloud/data/pricing.json
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/data/pricing.json?rev=1426894&r1=1426893&r2=1426894&view=diff
==============================================================================
--- libcloud/trunk/libcloud/data/pricing.json (original)
+++ libcloud/trunk/libcloud/data/pricing.json Sun Dec 30 06:04:37 2012
@@ -61,7 +61,8 @@
             "m3.2xlarge": 1.16,
             "cg1.4xlarge": 2.1,
             "cc1.4xlarge": 1.3,
-            "cc2.8xlarge": 2.4
+            "cc2.8xlarge": 2.4,
+            "hs1.8xlarge": 4.6
         },
 
         "ec2_us_west": {

Modified: libcloud/trunk/libcloud/test/compute/test_ec2.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_ec2.py?rev=1426894&r1=1426893&r2=1426894&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_ec2.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_ec2.py Sun Dec 30 06:04:37 2012
@@ -223,7 +223,7 @@ class EC2Tests(LibcloudTestCase, TestCas
             self.assertTrue('m2.4xlarge' in ids)
 
             if region_name == 'us-east-1':
-                self.assertEqual(len(sizes), 15)
+                self.assertEqual(len(sizes), 16)
                 self.assertTrue('cg1.4xlarge' in ids)
                 self.assertTrue('cc1.4xlarge' in ids)
                 self.assertTrue('cc2.8xlarge' in ids)