Repository: libcloud Updated Branches: refs/heads/trunk 452fd39c4 -> 1085bdb41
Add p2 instances Closes #996 Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5bc949d5 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5bc949d5 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5bc949d5 Branch: refs/heads/trunk Commit: 5bc949d58bc78a812da2ac79721e027fe0d87493 Parents: 452fd39 Author: MJK <[email protected]> Authored: Tue Feb 28 13:10:45 2017 -0800 Committer: Anthony Shaw <[email protected]> Committed: Sat Apr 1 13:22:23 2017 +1100 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 30 ++++++++++++++++++++++++++++++ libcloud/test/compute/test_ec2.py | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/5bc949d5/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index f376854..9205a67 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -324,6 +324,27 @@ INSTANCE_TYPES = { 'cpu': 32 } }, + 'p2.xlarge': { + 'id': 'p2.xlarge', + 'name': 'Cluster GPU P2 Large Instance', + 'ram': GiB(61), + 'disk' : 4, + 'bandwidth': None + }, + 'p2.8xlarge': { + 'id': 'p2.8xlarge', + 'name': 'Cluster GPU P2 Large Instance', + 'ram': GiB(488), + 'disk': 32, + 'bandwidth': None + }, + 'p2.16xlarge': { + 'id': 'p2.16xlarge', + 'name': 'Cluster GPU P2 Large Instance', + 'ram': GiB(732), + 'disk': 64, + 'bandwidth': None + }, 'cc1.4xlarge': { 'id': 'cc1.4xlarge', 'name': 'Cluster Compute Quadruple Extra Large Instance', @@ -881,6 +902,9 @@ REGION_DETAILS = { 'c1.xlarge', 'g2.2xlarge', 'g2.8xlarge', + 'p2.xlarge', + 'p2.8xlarge', + 'p2.16xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', @@ -1784,6 +1808,9 @@ OUTSCALE_SAS_REGION_DETAILS = { 'cc2.8xlarge', 'm3.xlarge', 'm3.2xlarge', + 'p2.xlarge', + 'p2.8xlarge', + 'p2.16xlarge', 'cr1.8xlarge', 'os1.8xlarge' ] @@ -1861,6 +1888,9 @@ OUTSCALE_INC_REGION_DETAILS = { 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', + 'p2.xlarge', + 'p2.8xlarge', + 'p2.16xlarge', 'nv1.small', 'nv1.medium', 'nv1.large', http://git-wip-us.apache.org/repos/asf/libcloud/blob/5bc949d5/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 659d669..bbf0823 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -437,7 +437,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): elif region_name == 'us-west-1': self.assertEqual(len(sizes), 46) if region_name == 'us-west-2': - self.assertEqual(len(sizes), 53) + self.assertEqual(len(sizes), 56) elif region_name == 'ap-southeast-1': self.assertEqual(len(sizes), 45) elif region_name == 'ap-southeast-2':
