Repository: libcloud Updated Branches: refs/heads/trunk aba6da988 -> abe0c99ae
Added EC2 x1 instance type Closes #1116 Signed-off-by: Tomaz Muraus <to...@tomaz.me> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a39050c5 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a39050c5 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a39050c5 Branch: refs/heads/trunk Commit: a39050c59f61fe0d8ee8d03ad9bfeac49cf0d546 Parents: aba6da9 Author: ZuluPro <montheanth...@hotmail.com> Authored: Mon Sep 18 05:07:28 2017 +0200 Committer: Tomaz Muraus <to...@tomaz.me> Committed: Thu Sep 21 23:17:59 2017 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 64 ++++++++++++++++++++++++++++------ libcloud/test/compute/test_ec2.py | 10 +++--- 2 files changed, 58 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/a39050c5/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 126d362..95d0392 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -850,6 +850,26 @@ INSTANCE_TYPES = { 'cpu': 8 } }, + 'x1.16xlarge': { + 'id': 'x1.16xlarge', + 'name': 'Memory Optimized Sixteen Extra Large instance', + 'ram': GiB(976), + 'disk': 1920, # GB + 'bandwidth': None, + 'extra': { + 'cpu': 64 + } + }, + 'x1e.32xlarge': { + 'id': 'x1e.32xlarge', + 'name': 'Memory Optimized ThirtyTwo E Extra Large instance', + 'ram': GiB(3904), + 'disk': 2 * 1920, # GB + 'bandwidth': None, + 'extra': { + 'cpu': 128 + } + }, 'x1.32xlarge': { 'id': 'x1.32xlarge', 'name': 'Memory Optimized ThirtyTwo Extra Large instance', @@ -940,7 +960,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # US West (Northern California) Region @@ -1089,7 +1111,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # US West (Oregon) Region @@ -1169,7 +1193,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # EU (Ireland) Region @@ -1246,7 +1272,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # EU (London) Region @@ -1316,7 +1344,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # EU (Frankfurt) Region @@ -1375,7 +1405,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # Asia Pacific (Mumbai, India) Region @@ -1491,7 +1523,9 @@ REGION_DETAILS = { 'r4.4xlarge', 'r4.8xlarge', 'r4.16xlarge', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # Asia Pacific (Tokyo) Region @@ -1564,7 +1598,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # Asia Pacific (Seoul) Region @@ -1615,7 +1651,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # South America (Sao Paulo) Region @@ -1725,7 +1763,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # Canada (Central) Region @@ -1795,7 +1835,9 @@ REGION_DETAILS = { 't2.small', 't2.medium', 't2.large', - 'x1.32xlarge' + 'x1.16xlarge', + 'x1.32xlarge', + 'x1e.32xlarge', ] }, # GovCloud Region http://git-wip-us.apache.org/repos/asf/libcloud/blob/a39050c5/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 3209ac4..8b17275 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -445,7 +445,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertTrue('m2.4xlarge' in ids) if region_name == 'us-east-1': - self.assertEqual(len(sizes), 70) + self.assertEqual(len(sizes), 72) self.assertTrue('cg1.4xlarge' in ids) self.assertTrue('cc2.8xlarge' in ids) self.assertTrue('cr1.8xlarge' in ids) @@ -453,13 +453,13 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): elif region_name == 'us-west-1': self.assertEqual(len(sizes), 61) if region_name == 'us-west-2': - self.assertEqual(len(sizes), 71) + self.assertEqual(len(sizes), 73) elif region_name == 'ap-southeast-1': - self.assertEqual(len(sizes), 57) + self.assertEqual(len(sizes), 59) elif region_name == 'ap-southeast-2': - self.assertEqual(len(sizes), 61) + self.assertEqual(len(sizes), 63) elif region_name == 'eu-west-1': - self.assertEqual(len(sizes), 68) + self.assertEqual(len(sizes), 70) elif region_name == 'ap-south-1': self.assertEqual(len(sizes), 41)
