Repository: jclouds Updated Branches: refs/heads/1.5.x 4e0ee7940 -> 3af38ff9f
add g2.2xlarge EC2 instance size (JCLOUDS-364) Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/df8fdb7c Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/df8fdb7c Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/df8fdb7c Branch: refs/heads/1.5.x Commit: df8fdb7c41af776b4d8a23f2939231d6aebc7a15 Parents: 4e0ee79 Author: jolly <[email protected]> Authored: Tue Nov 5 16:34:25 2013 -0800 Committer: Nikolay Sokolov <[email protected]> Committed: Thu Feb 27 15:40:18 2014 +0400 ---------------------------------------------------------------------- .../jclouds/ec2/compute/domain/EC2HardwareBuilder.java | 13 +++++++++++++ .../main/java/org/jclouds/ec2/domain/InstanceType.java | 13 +++++++++++++ .../jclouds/ec2/compute/EC2TemplateBuilderTest.java | 3 ++- .../ec2/compute/suppliers/AWSEC2HardwareSupplier.java | 2 ++ 4 files changed, 30 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/df8fdb7c/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/EC2HardwareBuilder.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/EC2HardwareBuilder.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/EC2HardwareBuilder.java index e35bf7e..f0ef035 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/EC2HardwareBuilder.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/EC2HardwareBuilder.java @@ -368,6 +368,19 @@ public class EC2HardwareBuilder extends HardwareBuilder { .virtualizationType(VirtualizationType.HVM); } + /** + * @see InstanceType#G2_2XLARGE + */ + public static EC2HardwareBuilder g2_2xlarge() { + return new EC2HardwareBuilder(InstanceType.G2_2XLARGE) + .ram(15*1024) + .processors(ImmutableList.of(new Processor(8.0, 3.25))) + .volumes( + ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(60.0f, + "/dev/sdb", false, false))) + .virtualizationType(VirtualizationType.HVM); + } + public static EC2HardwareBuilder hi1_4xlarge() { return new EC2HardwareBuilder(InstanceType.HI1_4XLARGE) .ram(60 * 1024 + 512) http://git-wip-us.apache.org/repos/asf/jclouds/blob/df8fdb7c/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java index f15be10..4fb9392 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java @@ -229,4 +229,17 @@ public class InstanceType { * </ul> */ public static final String HS1_8XLARGE = "hs1.8xlarge"; + + /** + * GPU Instance Double Extra Large + * <ul> + * <li>15 GiB of memory</li> + * <li>26 EC2 Compute Units (8 virtual cores*), 1xNVIDIA GRID GPU (Kepler GK104)</li> + * <li>60 GB instance storage</li> + * <li>64-bit platform</li> + * <li>I/O Performance: High</li> + * </ul> + */ + public static final String G2_2XLARGE = "g2.2xlarge"; + } http://git-wip-us.apache.org/repos/asf/jclouds/blob/df8fdb7c/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java index b85f3a6..108d8bc 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java @@ -23,6 +23,7 @@ import static org.easymock.EasyMock.replay; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c1_medium; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c1_xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.cc1_4xlarge; +import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.g2_2xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_large; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_small; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_xlarge; @@ -222,7 +223,7 @@ public class EC2TemplateBuilderTest { Supplier<Set<? extends Hardware>> sizes = Suppliers.<Set<? extends Hardware>> ofInstance(ImmutableSet .<Hardware> of(t1_micro().build(), c1_medium().build(), c1_xlarge().build(), m1_large().build(), m1_small().build(), m1_xlarge().build(), m2_xlarge().build(), m2_2xlarge().build(), - m2_4xlarge().build(), CC1_4XLARGE)); + m2_4xlarge().build(),g2_2xlarge().build(),CC1_4XLARGE)); return new EC2TemplateBuilderImpl(locations, images, sizes, Suppliers.ofInstance(location), optionsProvider, templateBuilderProvider, imageCache) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/df8fdb7c/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java index 8f9a001..e49fff4 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java @@ -21,6 +21,7 @@ import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c1_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; +import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.g2_2xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.hi1_4xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.hs1_8xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_large; @@ -68,6 +69,7 @@ public class AWSEC2HardwareSupplier extends EC2HardwareSupplier { sizes.add(cc2_8xlarge().supportsImageIds(ccAmis).build()); sizes.add(hi1_4xlarge().supportsImageIds(ccAmis).build()); sizes.add(hs1_8xlarge().supportsImageIds(ccAmis).build()); + sizes.add(g2_2xlarge().supportsImageIds(ccAmis).build()); sizes.addAll(ImmutableSet.<Hardware> of(t1_micro().build(), c1_medium().build(), c1_xlarge().build(), m1_large() .build(), m1_small().build(), m1_medium().build(), m1_xlarge().build(), m2_xlarge().build(), m2_2xlarge().build(), m2_4xlarge().build(), m3_xlarge().build(), m3_2xlarge().build()));
