Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added C4 instance types

This commit is contained in:
Ignasi Barrera 2015-02-03 15:03:49 +01:00
parent 10690f9293
commit 9a8a604bac
3 changed files with 122 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/EC2HardwareBuilder.java
View File

@ -480,6 +480,56 @@ public class EC2HardwareBuilder extends HardwareBuilder {
.is64Bit(true);
}
/**
* @see InstanceType#C4_LARGE
*/
public static EC2HardwareBuilder c4_large() {
return new EC2HardwareBuilder(InstanceType.C4_LARGE)
.ram(3840)
.processors(ImmutableList.of(new Processor(2.0, 3.5)))
.rootDeviceType(RootDeviceType.EBS);
}
/**
* @see InstanceType#C4_XLARGE
*/
public static EC2HardwareBuilder c4_xlarge() {
return new EC2HardwareBuilder(InstanceType.C4_XLARGE)
.ram(7680)
.processors(ImmutableList.of(new Processor(4.0, 3.5)))
.rootDeviceType(RootDeviceType.EBS);
}
/**
* @see InstanceType#C4_2XLARGE
*/
public static EC2HardwareBuilder c4_2xlarge() {
return new EC2HardwareBuilder(InstanceType.C4_2XLARGE)
.ram(15360)
.processors(ImmutableList.of(new Processor(8.0, 3.5)))
.rootDeviceType(RootDeviceType.EBS);
}
/**
* @see InstanceType#C4_4XLARGE
*/
public static EC2HardwareBuilder c4_4xlarge() {
return new EC2HardwareBuilder(InstanceType.C4_4XLARGE)
.ram(30720)
.processors(ImmutableList.of(new Processor(16.0, 3.5)))
.rootDeviceType(RootDeviceType.EBS);
}
/**
* @see InstanceType#C4_8XLARGE
*/
public static EC2HardwareBuilder c4_8xlarge() {
return new EC2HardwareBuilder(InstanceType.C4_8XLARGE)
.ram(61440)
.processors(ImmutableList.of(new Processor(36.0, 3.5)))
.rootDeviceType(RootDeviceType.EBS);
}
public static EC2HardwareBuilder cg1_4xlarge() {
return new EC2HardwareBuilder(InstanceType.CG1_4XLARGE)
.ram(22 * 1024)

55
apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java
View File

@ -361,6 +361,61 @@ public class InstanceType {
*/
public static final String C3_8XLARGE = "c3.8xlarge";
/**
* C4 Compute-optimized Extra Large
* <ul>
* <li>7.5 GiB of memory</li>
* <li>4 vCPU</li>
* <li>No instance storage (EBS storage only)</li>
* <li>750 Mbps Dedicated EBS Throughput</li>
* </ul>
*/
public static final String C4_XLARGE = "c4.xlarge";
/**
* C4 Compute-optimized Double Extra Large
* <ul>
* <li>8 GiB of memory</li>
* <li>15 vCPU</li>
* <li>No instance storage (EBS storage only)</li>
* <li>1000 Mbps Dedicated EBS Throughput</li>
* </ul>
*/
public static final String C4_2XLARGE = "c4.2xlarge";
/**
* C4 Compute-optimized Quadruple Extra Large
* <ul>
* <li>30 GiB of memory</li>
* <li>16 vCPU</li>
* <li>No instance storage (EBS storage only)</li>
* <li>2000 Mbps Dedicated EBS Throughput</li>
* </ul>
*/
public static final String C4_4XLARGE = "c4.4xlarge";
/**
* C4 Compute-optimized Octuple Extra Large
* <ul>
* <li>60 GiB of memory</li>
* <li>36 vCPU</li>
* <li>No instance storage (EBS storage only)</li>
* <li>4000 Mbps Dedicated EBS Throughput</li>
* </ul>
*/
public static final String C4_8XLARGE = "c4.8xlarge";
/**
* C4 Compute-optimized Large
* <ul>
* <li>3.75 GiB of memory</li>
* <li>2 vCPU</li>
* <li>No instance storage (EBS storage only)</li>
* <li>500 Mbps Dedicated EBS Throughput</li>
* </ul>
*/
public static final String C4_LARGE = "c4.large";
/**
* I2 Extra Large
* <ul>

24
providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java
View File

@ -21,8 +21,13 @@ import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c1_xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c3_2xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c3_4xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c3_8xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c3_xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c3_large;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c3_xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c4_2xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c4_4xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c4_8xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c4_large;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c4_xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.cc1_4xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.cc2_8xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.cg1_4xlarge;
@ -44,15 +49,15 @@ import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m3_2xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m3_large;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m3_medium;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m3_xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.t1_micro;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.t2_micro;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.t2_small;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.t2_medium;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.r3_large;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.r3_xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.r3_2xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.r3_4xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.r3_8xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.r3_large;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.r3_xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.t1_micro;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.t2_medium;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.t2_micro;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.t2_small;
import java.util.Set;
@ -97,6 +102,11 @@ public class AWSEC2HardwareSupplier extends EC2HardwareSupplier {
sizes.add(c3_2xlarge().build());
sizes.add(c3_4xlarge().build());
sizes.add(c3_8xlarge().build());
sizes.add(c4_large().build());
sizes.add(c4_xlarge().build());
sizes.add(c4_2xlarge().build());
sizes.add(c4_4xlarge().build());
sizes.add(c4_8xlarge().build());
sizes.add(i2_xlarge().build());
sizes.add(i2_2xlarge().build());
sizes.add(i2_4xlarge().build());