Updated Branches: refs/heads/trunk dcf3c6714 -> e783bad59
Add new m3.medium and m3.large instance information to the EC2 driver. Also include pricing data. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ac0d871a Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ac0d871a Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ac0d871a Branch: refs/heads/trunk Commit: ac0d871a89dbf683d2192a9361d87527d06f4d5e Parents: dcf3c67 Author: Tomaz Muraus <[email protected]> Authored: Sat Jan 25 12:53:51 2014 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Sat Jan 25 12:53:51 2014 +0100 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 32 ++++++++++++++++++++++++++++++-- libcloud/data/pricing.json | 16 ++++++++++++++++ libcloud/test/compute/test_ec2.py | 8 ++++---- 3 files changed, 50 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac0d871a/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 914e8a3..1eef018 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -139,18 +139,32 @@ INSTANCE_TYPES = { 'disk': 1690, 'bandwidth': None }, + 'm3.medium': { + 'id': 'm3.medium', + 'name': 'Medium Instance', + 'ram': 3840, + 'disk': 4000, + 'bandwidth': None + }, + 'm3.large': { + 'id': 'm3.large', + 'name': 'Large Instance', + 'ram': 7168, + 'disk': 32000, + 'bandwidth': None + }, 'm3.xlarge': { 'id': 'm3.xlarge', 'name': 'Extra Large Instance', 'ram': 15360, - 'disk': None, + 'disk': 80000, 'bandwidth': None }, 'm3.2xlarge': { 'id': 'm3.2xlarge', 'name': 'Double Extra Large Instance', 'ram': 30720, - 'disk': None, + 'disk': 160000, 'bandwidth': None }, 'cg1.4xlarge': { @@ -269,6 +283,8 @@ REGION_DETAILS = { 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', + 'm3.medium', + 'm3.large', 'm3.xlarge', 'm3.2xlarge', 'c1.medium', @@ -302,6 +318,8 @@ REGION_DETAILS = { 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', + 'm3.medium', + 'm3.large', 'm3.xlarge', 'm3.2xlarge', 'c1.medium', @@ -357,6 +375,8 @@ REGION_DETAILS = { 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', + 'm3.medium', + 'm3.large', 'm3.xlarge', 'm3.2xlarge', 'c1.medium', @@ -386,6 +406,8 @@ REGION_DETAILS = { 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', + 'm3.medium', + 'm3.large', 'm3.xlarge', 'm3.2xlarge', 'c1.medium', @@ -415,6 +437,8 @@ REGION_DETAILS = { 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', + 'm3.medium', + 'm3.large', 'm3.xlarge', 'm3.2xlarge', 'c1.medium', @@ -443,6 +467,8 @@ REGION_DETAILS = { 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', + 'm3.medium', + 'm3.large', 'm3.xlarge', 'm3.2xlarge', 'c1.medium', @@ -462,6 +488,8 @@ REGION_DETAILS = { 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', + 'm3.medium', + 'm3.large', 'm3.xlarge', 'm3.2xlarge', 'c1.medium', http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac0d871a/libcloud/data/pricing.json ---------------------------------------------------------------------- diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json index 4c9c699..6ff0061 100644 --- a/libcloud/data/pricing.json +++ b/libcloud/data/pricing.json @@ -81,6 +81,8 @@ "m2.xlarge": 0.50, "m2.2xlarge": 1.0, "m2.4xlarge": 2.0, + "m3.medium": 0.113, + "m3.large": 0.225, "m3.xlarge": 0.45, "m3.2xlarge": 0.90, "cg1.4xlarge": 2.1, @@ -110,6 +112,8 @@ "m2.xlarge": 0.57, "m2.2xlarge": 1.14, "m2.4xlarge": 2.28, + "m3.medium": 0.124, + "m3.large": 0.248, "m3.xlarge": 0.495, "m3.2xlarge": 0.990, "i2.xlarge": 0.85, @@ -134,6 +138,8 @@ "m2.xlarge": 0.50, "m2.2xlarge": 1.0, "m2.4xlarge": 2.0, + "m3.medium": 0.113, + "m3.large": 0.225, "m3.xlarge": 0.45, "m3.2xlarge": 0.90, "cc2.8xlarge": 2.400, @@ -159,6 +165,8 @@ "m2.xlarge": 0.57, "m2.2xlarge": 1.14, "m2.4xlarge": 2.28, + "m3.medium": 0.124, + "m3.large": 0.248, "m3.xlarge": 0.495, "m3.2xlarge": 0.990, "cc2.8xlarge": 2.7, @@ -184,6 +192,8 @@ "m2.xlarge": 0.57, "m2.2xlarge": 1.14, "m2.4xlarge": 2.28, + "m3.medium": 0.158, + "m3.large": 0.315, "m3.xlarge": 0.630, "m3.2xlarge": 1.260, "hs1.8xlarge": 5.570, @@ -209,6 +219,8 @@ "m2.xlarge": 0.60, "m2.2xlarge": 1.20, "m2.4xlarge": 2.39, + "m3.medium": 0.171, + "m3.large": 0.342, "m3.xlarge": 0.684, "m3.2xlarge": 1.368, "i2.xlarge": 0.85, @@ -228,6 +240,8 @@ "m2.xlarge": 0.68, "m2.2xlarge": 1.36, "m2.4xlarge": 2.72, + "m3.medium": 0.153, + "m3.large": 0.306, "m3.xlarge": 0.612, "m3.2xlarge": 1.224 }, @@ -248,6 +262,8 @@ "m2.xlarge": 0.506, "m2.2xlarge": 1.012, "m2.4xlarge": 2.024, + "m3.medium": 0.158, + "m3.large": 0.315, "m3.xlarge": 0.630, "m3.2xlarge": 1.260, "hs1.8xlarge": 5.570, http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac0d871a/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 2a8fd6e..1dbd809 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -369,18 +369,18 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertTrue('m2.4xlarge' in ids) if region_name == 'us-east-1': - self.assertEqual(len(sizes), 26) + self.assertEqual(len(sizes), 28) self.assertTrue('cg1.4xlarge' in ids) self.assertTrue('cc1.4xlarge' in ids) self.assertTrue('cc2.8xlarge' in ids) self.assertTrue('cr1.8xlarge' in ids) elif region_name in ['eu-west-1', 'ap-southeast-1', 'ap-southeast-2']: - self.assertEqual(len(sizes), 22) + self.assertEqual(len(sizes), 24) elif region_name == 'us-west-1': - self.assertEqual(len(sizes), 21) + self.assertEqual(len(sizes), 23) else: - self.assertEqual(len(sizes), 21) + self.assertEqual(len(sizes), 23) self.driver.region_name = region_old
