Repository: libcloud Updated Branches: refs/heads/cloudflare_dns_driver d38e745fa -> a43228ba4
adding support for c4 instance types Signed-off-by: Anthony Shaw <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/09613905 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/09613905 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/09613905 Branch: refs/heads/cloudflare_dns_driver Commit: 0961390552637c3f5a898f614f41a35f3f067be8 Parents: 3f77dea Author: Amit <[email protected]> Authored: Sun Nov 22 01:19:41 2015 +0000 Committer: Anthony Shaw <[email protected]> Committed: Sun Nov 22 16:41:23 2015 +1100 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 81 ++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/09613905/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 312ec44..eb3bc7b 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -295,6 +295,41 @@ INSTANCE_TYPES = { 'disk': 240, 'bandwidth': None }, + 'c4.large': { + 'id': 'c4.large', + 'name': 'Compute Optimized Large Instance', + 'ram': 3750, + 'disk': 0, + 'bandwidth': None + }, + 'c4.xlarge': { + 'id': 'c4.xlarge', + 'name': 'Compute Optimized Double Extra Large Instance', + 'ram': 7500, + 'disk': 0, + 'bandwidth': None + }, + 'c4.2xlarge': { + 'id': 'c4.2xlarge', + 'name': 'Compute Optimized Extra Large Instance', + 'ram': 15000, + 'disk': 0, + 'bandwidth': None + }, + 'c4.4xlarge': { + 'id': 'c4.4xlarge', + 'name': 'Compute Optimized Quadruple Extra Large Instance', + 'ram': 30000, + 'disk': 0, + 'bandwidth': None + }, + 'c4.8xlarge': { + 'id': 'c4.8xlarge', + 'name': 'Compute Optimized Eight Extra Large Instance', + 'ram': 60000, + 'disk': 0, + 'bandwidth': None + }, 'hs1.4xlarge': { 'id': 'hs1.4xlarge', 'name': 'High Storage Quadruple Extra Large Instance', @@ -468,6 +503,11 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', 'cg1.4xlarge', 'g2.2xlarge', 'cr1.8xlarge', @@ -522,6 +562,11 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', 'i2.xlarge', 'i2.2xlarge', 'i2.4xlarge', @@ -568,6 +613,11 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', 'hs1.8xlarge', 'cc2.8xlarge', 'i2.xlarge', @@ -620,6 +670,11 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', 'hs1.8xlarge', 'cc2.8xlarge', 'i2.xlarge', @@ -655,6 +710,11 @@ REGION_DETAILS = { 'c3.xlarge', 'c3.2xlarge', 'c3.4xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', 'm4.large', 'm4.xlarge', 'm4.2xlarge', @@ -710,6 +770,11 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', 'hs1.8xlarge', 'i2.xlarge', 'i2.2xlarge', @@ -751,6 +816,11 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', 'm4.large', 'm4.xlarge', 'm4.2xlarge', @@ -832,6 +902,11 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', 'hs1.8xlarge', 'i2.xlarge', 'i2.2xlarge', @@ -877,6 +952,11 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', 'hs1.4xlarge', 'hs1.8xlarge', 'i2.xlarge', @@ -2238,6 +2318,7 @@ class BaseEC2NodeDriver(NodeDriver): attributes = copy.deepcopy(attributes) price = self._get_size_price(size_id=instance_type) attributes.update({'price': price}) + print attributes sizes.append(NodeSize(driver=self, **attributes)) return sizes
