EC2: Add g2.8xlarge and t2.large >From <https://aws.amazon.com/ec2/instance-types/?nc1=f_ls>
Signed-off-by: Anthony Shaw <anthony.p.s...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/be9d9cba Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/be9d9cba Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/be9d9cba Branch: refs/heads/trunk Commit: be9d9cba6ba8d4d8f07ef36561b500bb0d04673f Parents: 14bf9c1 Author: Philipp Hahn <h...@univention.de> Authored: Tue Dec 1 09:01:10 2015 +0100 Committer: Anthony Shaw <anthony.p.s...@gmail.com> Committed: Sat Dec 5 07:14:55 2015 +1100 ---------------------------------------------------------------------- contrib/scrape-ec2-prices.py | 4 ++- libcloud/compute/drivers/ec2.py | 56 ++++++++++++++++++++++++++++------ libcloud/data/pricing.json | 35 +++++++++++++++------ libcloud/test/compute/test_ec2.py | 12 ++++---- 4 files changed, 81 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/be9d9cba/contrib/scrape-ec2-prices.py ---------------------------------------------------------------------- diff --git a/contrib/scrape-ec2-prices.py b/contrib/scrape-ec2-prices.py index d4d07b6..4c7b653 100755 --- a/contrib/scrape-ec2-prices.py +++ b/contrib/scrape-ec2-prices.py @@ -75,6 +75,7 @@ EC2_INSTANCE_TYPES = [ 'd2.8xlarge', 'cg1.4xlarge', 'g2.2xlarge', + 'g2.8xlarge', 'cr1.8xlarge', 'hs1.4xlarge', 'hs1.8xlarge', @@ -89,7 +90,8 @@ EC2_INSTANCE_TYPES = [ 'r3.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] # Maps EC2 region name to region name used in the pricing file http://git-wip-us.apache.org/repos/asf/libcloud/blob/be9d9cba/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index cb875d7..72a61b7 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -298,6 +298,16 @@ INSTANCE_TYPES = { 'cpu': 8 } }, + 'g2.8xlarge': { + 'id': 'g2.8xlarge', + 'name': 'Cluster GPU G2 Eight Extra Large Instance', + 'ram': GiB(60), + 'disk': 2 * 120, # GB + 'bandwidth': None, + 'extra': { + 'cpu': 32 + } + }, 'cc1.4xlarge': { 'id': 'cc1.4xlarge', 'name': 'Cluster Compute Quadruple Extra Large Instance', @@ -608,6 +618,16 @@ INSTANCE_TYPES = { 'extra': { 'cpu': 2 } + }, + 't2.large': { + 'id': 't2.large', + 'name': 'Burstable Performance Medium Instance', + 'ram': GiB(8), + 'disk': 0, # EBS Only + 'bandwidth': None, + 'extra': { + 'cpu': 2 + } } } @@ -651,6 +671,7 @@ REGION_DETAILS = { 'c4.8xlarge', 'cg1.4xlarge', 'g2.2xlarge', + 'g2.8xlarge', 'cr1.8xlarge', 'hs1.8xlarge', 'i2.xlarge', @@ -668,7 +689,8 @@ REGION_DETAILS = { 'r3.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, # US West (Northern California) Region @@ -698,6 +720,7 @@ REGION_DETAILS = { 'c1.medium', 'c1.xlarge', 'g2.2xlarge', + 'g2.8xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', @@ -719,7 +742,8 @@ REGION_DETAILS = { 'r3.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, # US West (Oregon) Region @@ -749,6 +773,7 @@ REGION_DETAILS = { 'c1.medium', 'c1.xlarge', 'g2.2xlarge', + 'g2.8xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', @@ -776,7 +801,8 @@ REGION_DETAILS = { 'r3.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, # EU (Ireland) Region @@ -806,6 +832,7 @@ REGION_DETAILS = { 'c1.medium', 'c1.xlarge', 'g2.2xlarge', + 'g2.8xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', @@ -833,7 +860,8 @@ REGION_DETAILS = { 'r3.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, # EU (Frankfurt) Region @@ -877,7 +905,8 @@ REGION_DETAILS = { 'r3.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, # Asia Pacific (Singapore) Region @@ -927,7 +956,8 @@ REGION_DETAILS = { 'd2.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, # Asia Pacific (Tokyo) Region @@ -951,6 +981,7 @@ REGION_DETAILS = { 'm3.2xlarge', 'c1.medium', 'g2.2xlarge', + 'g2.8xlarge', 'c1.xlarge', 'c3.large', 'c3.xlarge', @@ -983,7 +1014,8 @@ REGION_DETAILS = { 'r3.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, # South America (Sao Paulo) Region @@ -1009,7 +1041,8 @@ REGION_DETAILS = { 'c1.xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, # Asia Pacific (Sydney) Region @@ -1064,7 +1097,8 @@ REGION_DETAILS = { 'r3.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, 'us-gov-west-1': { @@ -1088,6 +1122,7 @@ REGION_DETAILS = { 'c1.medium', 'c1.xlarge', 'g2.2xlarge', + 'g2.8xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', @@ -1111,7 +1146,8 @@ REGION_DETAILS = { 'r3.8xlarge', 't2.micro', 't2.small', - 't2.medium' + 't2.medium', + 't2.large' ] }, 'nimbus': { http://git-wip-us.apache.org/repos/asf/libcloud/blob/be9d9cba/libcloud/data/pricing.json ---------------------------------------------------------------------- diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json index 0f42160..9b18121 100644 --- a/libcloud/data/pricing.json +++ b/libcloud/data/pricing.json @@ -55,6 +55,7 @@ "d2.8xlarge": "6.752", "d2.xlarge": "0.844", "g2.2xlarge": "0.898", + "g2.8xlarge": "3.592", "hi1.4xlarge": "3.276", "hs1.8xlarge": "5.400", "i2.2xlarge": "2.001", @@ -85,7 +86,8 @@ "t1.micro": "0.026", "t2.medium": "0.080", "t2.micro": "0.020", - "t2.small": "0.040" + "t2.small": "0.040", + "t2.large": "0.16" }, "ec2_ap_southeast": { "c1.medium": "0.164", @@ -104,6 +106,7 @@ "d2.4xlarge": "3.480", "d2.8xlarge": "6.960", "d2.xlarge": "0.870", + "g2.8xlarge": "4", "g2.2xlarge": "1.000", "hi1.4xlarge": "N/A", "hs1.8xlarge": "5.570", @@ -135,7 +138,8 @@ "t1.micro": "0.020", "t2.medium": "0.080", "t2.micro": "0.020", - "t2.small": "0.040" + "t2.small": "0.040", + "t2.large": "0.16" }, "ec2_ap_southeast_2": { "c1.medium": "0.164", @@ -155,6 +159,7 @@ "d2.8xlarge": "6.960", "d2.xlarge": "0.870", "g2.2xlarge": "0.898", + "g2.8xlarge": "3.592", "hi1.4xlarge": "N/A", "hs1.8xlarge": "5.570", "i2.2xlarge": "2.035", @@ -185,7 +190,8 @@ "t1.micro": "0.020", "t2.medium": "0.080", "t2.micro": "0.020", - "t2.small": "0.040" + "t2.small": "0.040", + "t2.large": "0.16" }, "ec2_eu_central": { "c3.2xlarge": "0.516", @@ -203,6 +209,7 @@ "d2.8xlarge": "6.352", "d2.xlarge": "0.794", "g2.2xlarge": null, + "g2.8xlarge": "3.088", "i2.2xlarge": "2.026", "i2.4xlarge": "4.051", "i2.8xlarge": "8.102", @@ -223,7 +230,8 @@ "r3.xlarge": "0.421", "t2.medium": "0.060", "t2.micro": "0.015", - "t2.small": "0.030" + "t2.small": "0.030", + "t2.large": "0.12" }, "ec2_eu_west": { "c1.medium": "0.148", @@ -246,6 +254,7 @@ "d2.8xlarge": "5.880", "d2.xlarge": "0.735", "g2.2xlarge": "0.702", + "g2.8xlarge": "2.808", "hi1.4xlarge": "3.100", "hs1.8xlarge": "4.900", "i2.2xlarge": "1.876", @@ -276,7 +285,8 @@ "t1.micro": "0.020", "t2.medium": "0.056", "t2.micro": "0.014", - "t2.small": "0.028" + "t2.small": "0.028", + "t2.large": "0.112" }, "ec2_sa_east": { "c1.medium": "0.179", @@ -302,7 +312,8 @@ "t1.micro": "0.027", "t2.medium": "0.108", "t2.micro": "0.027", - "t2.small": "0.054" + "t2.small": "0.054", + "t2.large": "0.216" }, "ec2_us_east": { "c1.medium": "0.130", @@ -325,6 +336,7 @@ "d2.8xlarge": "5.520", "d2.xlarge": "0.690", "g2.2xlarge": "0.650", + "g2.8xlarge": "2.6", "hi1.4xlarge": "3.100", "hs1.8xlarge": "4.600", "i2.2xlarge": "1.705", @@ -391,7 +403,8 @@ "t1.micro": "0.024", "t2.medium": "0.062", "t2.micro": "0.015", - "t2.small": "0.031" + "t2.small": "0.031", + "t2.large": "0.124" }, "ec2_us_west": { "c1.medium": "0.148", @@ -407,6 +420,7 @@ "c4.large": "0.138", "c4.xlarge": "0.276", "g2.2xlarge": "0.702", + "g2.8xlarge": "2.808", "hi1.4xlarge": "N/A", "hs1.8xlarge": "N/A", "i2.2xlarge": "1.876", @@ -437,7 +451,8 @@ "t1.micro": "0.025", "t2.medium": "0.068", "t2.micro": "0.017", - "t2.small": "0.034" + "t2.small": "0.034", + "t2.large": "0.136" }, "ec2_us_west_oregon": { "c1.medium": "0.130", @@ -459,6 +474,7 @@ "d2.8xlarge": "5.520", "d2.xlarge": "0.690", "g2.2xlarge": "0.650", + "g2.8xlarge": "2.6", "hi1.4xlarge": "3.100", "hs1.8xlarge": "4.600", "i2.2xlarge": "1.705", @@ -489,7 +505,8 @@ "t1.micro": "0.020", "t2.medium": "0.052", "t2.micro": "0.013", - "t2.small": "0.026" + "t2.small": "0.026", + "t2.large": "0.104" }, "elastichosts": { "extra-large": 0.579, http://git-wip-us.apache.org/repos/asf/libcloud/blob/be9d9cba/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 1b9ea61..79b5dc5 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -415,20 +415,20 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertTrue('m2.4xlarge' in ids) if region_name == 'us-east-1': - self.assertEqual(len(sizes), 50) + self.assertEqual(len(sizes), 52) self.assertTrue('cg1.4xlarge' in ids) self.assertTrue('cc2.8xlarge' in ids) self.assertTrue('cr1.8xlarge' in ids) elif region_name == 'us-west-1': - self.assertEqual(len(sizes), 42) + self.assertEqual(len(sizes), 44) if region_name == 'us-west-2': - self.assertEqual(len(sizes), 39) - elif region_name == 'ap-southeast-1': self.assertEqual(len(sizes), 41) + elif region_name == 'ap-southeast-1': + self.assertEqual(len(sizes), 42) elif region_name == 'ap-southeast-2': - self.assertEqual(len(sizes), 46) + self.assertEqual(len(sizes), 47) elif region_name == 'eu-west-1': - self.assertEqual(len(sizes), 48) + self.assertEqual(len(sizes), 50) self.driver.region_name = region_old
