Repository: libcloud Updated Branches: refs/heads/trunk 8a9d3797d -> 110437e46
Added AWS EC2 g3 instance types Closes #1101 Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/81581b4e Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/81581b4e Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/81581b4e Branch: refs/heads/trunk Commit: 81581b4ef84eb14cf0de6d3cac28ca34503819fd Parents: 8a9d379 Author: ZuluPro <[email protected]> Authored: Sun Aug 13 06:13:02 2017 +0200 Committer: Anthony Shaw <[email protected]> Committed: Mon Sep 4 08:50:13 2017 +1000 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 55 ++++++++++++++++++++++++++++++++++ libcloud/test/compute/test_ec2.py | 8 ++--- 2 files changed, 59 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/81581b4e/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 2a5ed4c..126d362 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -322,6 +322,42 @@ INSTANCE_TYPES = { 'cpu': 32 } }, + 'g3.4xlarge': { + 'id': 'g3.4xlarge', + 'name': 'Cluster GPU G3 Four Extra Large Instance', + 'ram': GiB(122), + 'disk': 0, # EBS only + 'bandwidth': None, + 'extra': { + 'cpu': 16, + 'gpu': 1, + 'gpu_ram': GiB(8) + } + }, + 'g3.8xlarge': { + 'id': 'g3.8xlarge', + 'name': 'Cluster GPU G3 Eight Extra Large Instance', + 'ram': GiB(244), + 'disk': 0, # EBS only + 'bandwidth': None, + 'extra': { + 'cpu': 32, + 'gpu': 2, + 'gpu_ram': GiB(16) + } + }, + 'g3.16xlarge': { + 'id': 'g3.16xlarge', + 'name': 'Cluster GPU G3 16 Extra Large Instance', + 'ram': GiB(488), + 'disk': 0, # EBS only + 'bandwidth': None, + 'extra': { + 'cpu': 64, + 'gpu': 4, + 'gpu_ram': GiB(32) + } + }, 'p2.xlarge': { 'id': 'p2.xlarge', 'name': 'Cluster GPU P2 Large Instance', @@ -869,6 +905,9 @@ REGION_DETAILS = { 'cg1.4xlarge', 'g2.2xlarge', 'g2.8xlarge', + 'g3.4xlarge', + 'g3.8xlarge', + 'g3.16xlarge', 'cr1.8xlarge', 'hs1.8xlarge', 'i2.xlarge', @@ -933,6 +972,9 @@ REGION_DETAILS = { 'c1.xlarge', 'g2.2xlarge', 'g2.8xlarge', + 'g3.4xlarge', + 'g3.8xlarge', + 'g3.16xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', @@ -1012,6 +1054,9 @@ REGION_DETAILS = { 'cg1.4xlarge', 'g2.2xlarge', 'g2.8xlarge', + 'g3.4xlarge', + 'g3.8xlarge', + 'g3.16xlarge', 'cr1.8xlarge', 'hs1.8xlarge', 'i2.xlarge', @@ -1076,6 +1121,9 @@ REGION_DETAILS = { 'c1.xlarge', 'g2.2xlarge', 'g2.8xlarge', + 'g3.4xlarge', + 'g3.8xlarge', + 'g3.16xlarge', 'p2.xlarge', 'p2.8xlarge', 'p2.16xlarge', @@ -1153,6 +1201,9 @@ REGION_DETAILS = { 'c1.xlarge', 'g2.2xlarge', 'g2.8xlarge', + 'g3.4xlarge', + 'g3.8xlarge', + 'g3.16xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', @@ -1747,6 +1798,7 @@ REGION_DETAILS = { 'x1.32xlarge' ] }, + # GovCloud Region 'us-gov-west-1': { 'endpoint': 'ec2.us-gov-west-1.amazonaws.com', 'api_name': 'ec2_us_govwest', @@ -1775,6 +1827,9 @@ REGION_DETAILS = { 'c1.xlarge', 'g2.2xlarge', 'g2.8xlarge', + 'g3.4xlarge', + 'g3.8xlarge', + 'g3.16xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', http://git-wip-us.apache.org/repos/asf/libcloud/blob/81581b4e/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 1fe4183..3209ac4 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -445,21 +445,21 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertTrue('m2.4xlarge' in ids) if region_name == 'us-east-1': - self.assertEqual(len(sizes), 67) + self.assertEqual(len(sizes), 70) self.assertTrue('cg1.4xlarge' in ids) self.assertTrue('cc2.8xlarge' in ids) self.assertTrue('cr1.8xlarge' in ids) self.assertTrue('x1.32xlarge' in ids) elif region_name == 'us-west-1': - self.assertEqual(len(sizes), 58) + self.assertEqual(len(sizes), 61) if region_name == 'us-west-2': - self.assertEqual(len(sizes), 68) + self.assertEqual(len(sizes), 71) elif region_name == 'ap-southeast-1': self.assertEqual(len(sizes), 57) elif region_name == 'ap-southeast-2': self.assertEqual(len(sizes), 61) elif region_name == 'eu-west-1': - self.assertEqual(len(sizes), 65) + self.assertEqual(len(sizes), 68) elif region_name == 'ap-south-1': self.assertEqual(len(sizes), 41)
