Repository: libcloud Updated Branches: refs/heads/trunk a03877af9 -> a39c4e254
Added EC2 M5 sizes Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/2787407a Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/2787407a Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/2787407a Branch: refs/heads/trunk Commit: 2787407ab31163b586810a92f050a4d88bec4ed7 Parents: a03877a Author: Anthony Monthe <[email protected]> Authored: Thu Jan 4 13:28:38 2018 +0000 Committer: Anthony Monthe <[email protected]> Committed: Thu Jan 4 13:28:38 2018 +0000 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 78 ++++++++++++++++++++++++++++++++++ libcloud/test/compute/test_ec2.py | 6 +-- 2 files changed, 81 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/2787407a/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index c6d5065..e225383 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -292,6 +292,66 @@ INSTANCE_TYPES = { 'cpu': 64 } }, + 'm5.large': { + 'id': 'm5.large', + 'name': 'Large Instance', + 'ram': GiB(8), + 'disk': 0, # EBS only + 'bandwidth': None, + 'extra': { + 'cpu': 2 + } + }, + 'm5.xlarge': { + 'id': 'm5.xlarge', + 'name': 'Extra Large Instance', + 'ram': GiB(16), + 'disk': 0, # EBS only + 'bandwidth': None, + 'extra': { + 'cpu': 4 + } + }, + 'm5.2xlarge': { + 'id': 'm5.2xlarge', + 'name': 'Double Extra Large Instance', + 'ram': GiB(32), + 'disk': 0, # EBS only + 'bandwidth': None, + 'extra': { + 'cpu': 8 + } + }, + 'm5.4xlarge': { + 'id': 'm5.4xlarge', + 'name': 'Quadruple Extra Large Instance', + 'ram': GiB(64), + 'disk': 0, # EBS only + 'bandwidth': None, + 'extra': { + 'cpu': 16 + } + }, + 'm5.12xlarge': { + 'id': 'm5.12xlarge', + 'name': '12 Extra Large Instance', + 'ram': GiB(192), + 'disk': 0, # EBS only + 'bandwidth': None, + 'extra': { + 'cpu': 48 + } + }, + 'm5.24xlarge': { + 'id': 'm5.24xlarge', + 'name': '24 Extra Large Instance', + 'ram': GiB(384), + 'disk': 0, # EBS only + 'bandwidth': None, + 'extra': { + 'cpu': 96 + } + }, 'cg1.4xlarge': { 'id': 'cg1.4xlarge', 'name': 'Cluster GPU Quadruple Extra Large Instance', @@ -969,6 +1029,12 @@ REGION_DETAILS = { 'm4.4xlarge', 'm4.10xlarge', 'm4.16xlarge', + 'm5.large', + 'm5.xlarge', + 'm5.2xlarge', + 'm5.4xlarge', + 'm5.12xlarge', + 'm5.24xlarge', 'c1.medium', 'c1.xlarge', 'cc2.8xlarge', @@ -1213,6 +1279,12 @@ REGION_DETAILS = { 'm4.4xlarge', 'm4.10xlarge', 'm4.16xlarge', + 'm5.large', + 'm5.xlarge', + 'm5.2xlarge', + 'm5.4xlarge', + 'm5.12xlarge', + 'm5.24xlarge', 'c1.medium', 'c1.xlarge', 'g2.2xlarge', @@ -1295,6 +1367,12 @@ REGION_DETAILS = { 'm4.4xlarge', 'm4.10xlarge', 'm4.16xlarge', + 'm5.large', + 'm5.xlarge', + 'm5.2xlarge', + 'm5.4xlarge', + 'm5.12xlarge', + 'm5.24xlarge', 'c1.medium', 'c1.xlarge', 'g2.2xlarge', http://git-wip-us.apache.org/repos/asf/libcloud/blob/2787407a/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 0c96a53..17f293e 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -448,7 +448,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertTrue('m2.4xlarge' in ids) if region_name == 'us-east-1': - self.assertEqual(len(sizes), 78) + self.assertEqual(len(sizes), 84) self.assertTrue('cg1.4xlarge' in ids) self.assertTrue('cc2.8xlarge' in ids) self.assertTrue('cr1.8xlarge' in ids) @@ -456,13 +456,13 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): elif region_name == 'us-west-1': self.assertEqual(len(sizes), 67) if region_name == 'us-west-2': - self.assertEqual(len(sizes), 73) + self.assertEqual(len(sizes), 79) elif region_name == 'ap-southeast-1': self.assertEqual(len(sizes), 59) elif region_name == 'ap-southeast-2': self.assertEqual(len(sizes), 63) elif region_name == 'eu-west-1': - self.assertEqual(len(sizes), 76) + self.assertEqual(len(sizes), 82) elif region_name == 'ap-south-1': self.assertEqual(len(sizes), 41)
