You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/01/27 20:45:47 UTC
[1/3] git commit: JCLOUDS-431: Added m3.medium and m3.large instance
types to EC2
Updated Branches:
refs/heads/JCLOUDS-415 d24324098 -> 9e97b7a48 (forced update)
JCLOUDS-431: Added m3.medium and m3.large instance types to EC2
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0625c087
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0625c087
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0625c087
Branch: refs/heads/JCLOUDS-415
Commit: 0625c087fa89f91fa25a2ac576b5847a7bbad76e
Parents: 8ff6002
Author: Ignasi Barrera <na...@apache.org>
Authored: Thu Jan 23 00:23:26 2014 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Fri Jan 24 16:32:08 2014 +0100
----------------------------------------------------------------------
.../ec2/compute/domain/EC2HardwareBuilder.java | 214 +++++++++++--------
.../org/jclouds/ec2/domain/InstanceType.java | 36 ++++
.../suppliers/AWSEC2HardwareSupplier.java | 39 +++-
3 files changed, 201 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0625c087/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 a022e57..185644e 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
@@ -18,6 +18,7 @@ package org.jclouds.ec2.compute.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.not;
+import static org.jclouds.compute.domain.Volume.Type.LOCAL;
import static org.jclouds.compute.predicates.ImagePredicates.any;
import static org.jclouds.compute.predicates.ImagePredicates.idIn;
@@ -31,7 +32,7 @@ import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Processor;
import org.jclouds.compute.domain.Volume;
-import org.jclouds.compute.domain.internal.VolumeImpl;
+import org.jclouds.compute.domain.VolumeBuilder;
import org.jclouds.compute.predicates.ImagePredicates;
import org.jclouds.domain.Location;
import org.jclouds.ec2.domain.InstanceType;
@@ -210,9 +211,9 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.M1_SMALL)
.ram(1740)
.processors(ImmutableList.of(new Processor(1.0, 1.0)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(150.0f,
- "/dev/sda2", false, false)));
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(150.0f).device("/dev/sda2").bootDevice(false).durable(false).build()));
}
/**
@@ -222,9 +223,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.M1_MEDIUM)
.ram(3750)
.processors(ImmutableList.of(new Processor(1.0, 2.0)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(420.0f,
- "/dev/sdb", false, false), new VolumeImpl(420.0f, "/dev/sdc", false, false)));
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdc").bootDevice(false).durable(false).build()));
}
@@ -243,9 +245,11 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.M1_LARGE)
.ram(7680)
.processors(ImmutableList.of(new Processor(2.0, 2.0)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(420.0f,
- "/dev/sdb", false, false), new VolumeImpl(420.0f, "/dev/sdc", false, false))).is64Bit(true);
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
+ .is64Bit(true);
}
/**
@@ -255,10 +259,12 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.M1_XLARGE)
.ram(15360)
.processors(ImmutableList.of(new Processor(4.0, 2.0)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(420.0f,
- "/dev/sdb", false, false), new VolumeImpl(420.0f, "/dev/sdc", false, false), new VolumeImpl(
- 420.0f, "/dev/sdd", false, false), new VolumeImpl(420.0f, "/dev/sde", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdc").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdd").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sde").bootDevice(false).durable(false).build()))
.is64Bit(true);
}
@@ -268,7 +274,9 @@ public class EC2HardwareBuilder extends HardwareBuilder {
public static EC2HardwareBuilder m2_xlarge() {
return new EC2HardwareBuilder(InstanceType.M2_XLARGE).ram(17510)
.processors(ImmutableList.of(new Processor(2.0, 3.25)))
- .volumes(ImmutableList.<Volume> of(new VolumeImpl(420.0f, "/dev/sda1", true, false))).is64Bit(true);
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sda1").bootDevice(true).durable(false).build()))
+ .is64Bit(true);
}
/**
@@ -278,9 +286,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.M2_2XLARGE)
.ram(35020)
.processors(ImmutableList.of(new Processor(4.0, 3.25)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(840.0f,
- "/dev/sdb", false, false))).is64Bit(true);
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdb").bootDevice(false).durable(false).build()))
+ .is64Bit(true);
}
/**
@@ -290,12 +299,38 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.M2_4XLARGE)
.ram(70041)
.processors(ImmutableList.of(new Processor(8.0, 3.25)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(840.0f,
- "/dev/sdb", false, false), new VolumeImpl(840.0f, "/dev/sdc", false, false))).is64Bit(true);
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
+ .is64Bit(true);
}
/**
+ * @see InstanceType#M3_MEDIUM
+ */
+ public static EC2HardwareBuilder m3_medium() {
+ return new EC2HardwareBuilder(InstanceType.M3_MEDIUM)
+ .ram(3840)
+ .processors(ImmutableList.of(new Processor(1.0, 3.0)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(4.0f).device("/dev/sdb").bootDevice(false).durable(false).build()));
+ }
+
+ /**
+ * @see InstanceType#M3_LARGE
+ */
+ public static EC2HardwareBuilder m3_large() {
+ return new EC2HardwareBuilder(InstanceType.M3_LARGE)
+ .ram(7680)
+ .processors(ImmutableList.of(new Processor(2.0, 3.25)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(32.0f).device("/dev/sdb").bootDevice(false).durable(false).build()));
+ }
+
+ /**
* @see InstanceType#M3_XLARGE
*/
public static EC2HardwareBuilder m3_xlarge() {
@@ -318,9 +353,9 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.C1_MEDIUM)
.ram(1740)
.processors(ImmutableList.of(new Processor(2.0, 2.5)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(340.0f,
- "/dev/sda2", false, false)));
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(340.0f).device("/dev/sda2").bootDevice(false).durable(false).build()));
}
/**
@@ -330,10 +365,12 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.C1_XLARGE)
.ram(7168)
.processors(ImmutableList.of(new Processor(8.0, 2.5)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(420.0f,
- "/dev/sdb", false, false), new VolumeImpl(420.0f, "/dev/sdc", false, false), new VolumeImpl(
- 420.0f, "/dev/sdd", false, false), new VolumeImpl(420.0f, "/dev/sde", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdc").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sdd").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(420.0f).device("/dev/sde").bootDevice(false).durable(false).build()))
.is64Bit(true);
}
@@ -344,10 +381,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.C3_LARGE)
.ram(3750)
.processors(ImmutableList.of(new Processor(2.0, 3.5)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false),
- new VolumeImpl(16.0f, "/dev/sdb", false, false),
- new VolumeImpl(16.0f, "/dev/sdc", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(16.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(16.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
.is64Bit(true);
}
@@ -358,10 +395,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.C3_XLARGE)
.ram(7168)
.processors(ImmutableList.of(new Processor(4.0, 3.5)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false),
- new VolumeImpl(40.0f, "/dev/sdb", false, false),
- new VolumeImpl(40.0f, "/dev/sdc", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(40.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(40.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
.is64Bit(true);
}
@@ -372,10 +409,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.C3_2XLARGE)
.ram(15360)
.processors(ImmutableList.of(new Processor(8.0, 3.5)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false),
- new VolumeImpl(80.0f, "/dev/sdb", false, false),
- new VolumeImpl(80.0f, "/dev/sdc", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(80.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(80.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
.is64Bit(true);
}
@@ -386,10 +423,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.C3_4XLARGE)
.ram(30720)
.processors(ImmutableList.of(new Processor(16.0, 3.4375)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false),
- new VolumeImpl(160.0f, "/dev/sdb", false, false),
- new VolumeImpl(160.0f, "/dev/sdc", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(160.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(160.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
.is64Bit(true);
}
@@ -400,10 +437,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.C3_8XLARGE)
.ram(61440)
.processors(ImmutableList.of(new Processor(32.0, 3.375)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false),
- new VolumeImpl(320.0f, "/dev/sdb", false, false),
- new VolumeImpl(320.0f, "/dev/sdc", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(320.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(320.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
.is64Bit(true);
}
@@ -411,9 +448,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.CG1_4XLARGE)
.ram(22 * 1024)
.processors(ImmutableList.of(new Processor(4.0, 4.0), new Processor(4.0, 4.0)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(840.0f,
- "/dev/sdb", false, false), new VolumeImpl(840.0f, "/dev/sdc", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
.virtualizationType(VirtualizationType.HVM);
}
@@ -421,9 +459,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.CC1_4XLARGE)
.ram(23 * 1024)
.processors(ImmutableList.of(new Processor(4.0, 4.0), new Processor(4.0, 4.0)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(840.0f,
- "/dev/sdb", false, false), new VolumeImpl(840.0f, "/dev/sdc", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
.virtualizationType(VirtualizationType.HVM);
}
@@ -431,10 +470,12 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.CC2_8XLARGE)
.ram(60 * 1024 + 512)
.processors(ImmutableList.of(new Processor(8.0, 5.5), new Processor(8.0, 5.5)))
- .volumes(
- ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false), new VolumeImpl(840.0f,
- "/dev/sdb", false, false), new VolumeImpl(840.0f, "/dev/sdc", false, false), new VolumeImpl(
- 840.0f, "/dev/sdb", false, false), new VolumeImpl(840.0f, "/dev/sdc", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdc").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sdd").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(840.0f).device("/dev/sde").bootDevice(false).durable(false).build()))
.virtualizationType(VirtualizationType.HVM);
}
@@ -445,9 +486,9 @@ public class EC2HardwareBuilder extends HardwareBuilder {
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)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(60.0f).device("/dev/sdb").bootDevice(false).durable(false).build()))
.virtualizationType(VirtualizationType.HVM);
}
@@ -458,8 +499,9 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.I2_XLARGE)
.ram(30 * 1024 + 512)
.processors(ImmutableList.of(new Processor(4.0, 3.5)))
- .volumes(ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false),
- new VolumeImpl(800.0f, "/dev/sdb", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdb").bootDevice(false).durable(false).build()))
.virtualizationType(VirtualizationType.HVM);
}
@@ -470,9 +512,10 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.I2_2XLARGE)
.ram(61 * 1024)
.processors(ImmutableList.of(new Processor(8.0, 3.375)))
- .volumes(ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false),
- new VolumeImpl(800.0f, "/dev/sdb", false, false),
- new VolumeImpl(800.0f, "/dev/sdc", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdc").bootDevice(false).durable(false).build()))
.virtualizationType(VirtualizationType.HVM);
}
@@ -483,11 +526,12 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.I2_4XLARGE)
.ram(122 * 1024)
.processors(ImmutableList.of(new Processor(16.0, 3.3125)))
- .volumes(ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false),
- new VolumeImpl(800.0f, "/dev/sdb", false, false),
- new VolumeImpl(800.0f, "/dev/sdc", false, false),
- new VolumeImpl(800.0f, "/dev/sdd", false, false),
- new VolumeImpl(800.0f, "/dev/sde", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdc").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdd").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sde").bootDevice(false).durable(false).build()))
.virtualizationType(VirtualizationType.HVM);
}
@@ -498,15 +542,16 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.I2_8XLARGE)
.ram(244 * 1024)
.processors(ImmutableList.of(new Processor(32.0, 3.25)))
- .volumes(ImmutableList.<Volume> of(new VolumeImpl(10.0f, "/dev/sda1", true, false),
- new VolumeImpl(800.0f, "/dev/sdb", false, false),
- new VolumeImpl(800.0f, "/dev/sdc", false, false),
- new VolumeImpl(800.0f, "/dev/sdd", false, false),
- new VolumeImpl(800.0f, "/dev/sde", false, false),
- new VolumeImpl(800.0f, "/dev/sdf", false, false),
- new VolumeImpl(800.0f, "/dev/sdg", false, false),
- new VolumeImpl(800.0f, "/dev/sdh", false, false),
- new VolumeImpl(800.0f, "/dev/sdi", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(10.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdb").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdc").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdd").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sde").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdf").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdg").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdh").bootDevice(false).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(800.0f).device("/dev/sdi").bootDevice(false).durable(false).build()))
.virtualizationType(VirtualizationType.HVM);
}
@@ -514,18 +559,19 @@ public class EC2HardwareBuilder extends HardwareBuilder {
return new EC2HardwareBuilder(InstanceType.HI1_4XLARGE)
.ram(60 * 1024 + 512)
.processors(ImmutableList.of(new Processor(16.0, 2.1875)))
- .volumes(ImmutableList.<Volume> of(new VolumeImpl(1024.0f, "/dev/sda1", true, false),
- new VolumeImpl(1024.0f, "/dev/sdb", false, false)))
+ .volumes(ImmutableList.<Volume> of(
+ new VolumeBuilder().type(LOCAL).size(1024.0f).device("/dev/sda1").bootDevice(true).durable(false).build(),
+ new VolumeBuilder().type(LOCAL).size(1024.0f).device("/dev/sdb").bootDevice(false).durable(false).build()))
.virtualizationType(VirtualizationType.HVM);
}
public static EC2HardwareBuilder hs1_8xlarge() {
float twoTB = 2048.0f * 1024.0f;
Builder<Volume> all24Volumes = ImmutableList.<Volume>builder();
- all24Volumes.add(new VolumeImpl(twoTB, "/dev/sda1", true, false));
+ all24Volumes.add(new VolumeBuilder().type(LOCAL).size(twoTB).device("/dev/sda1").bootDevice(true).durable(false).build());
for (char letter : ImmutableSet.of('b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
'q', 'r', 's', 't', 'u', 'v', 'w', 'x')) {
- all24Volumes.add(new VolumeImpl(twoTB, "/dev/sd" + letter, false, false));
+ all24Volumes.add(new VolumeBuilder().type(LOCAL).size(twoTB).device("/dev/sd" + letter).bootDevice(false).durable(false).build());
}
return new EC2HardwareBuilder(InstanceType.HS1_8XLARGE)
.ram(117 * 1024)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0625c087/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 7249b7f..b57811c 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
@@ -27,6 +27,7 @@ package org.jclouds.ec2.domain;
*
*/
public class InstanceType {
+
/**
* Micro Instance
* <ul>
@@ -37,6 +38,7 @@ public class InstanceType {
* </ul>
*/
public static final String T1_MICRO = "t1.micro";
+
/**
* Small Instance
* <ul>
@@ -48,6 +50,7 @@ public class InstanceType {
* </ul>
*/
public static final String M1_SMALL = "m1.small";
+
/**
* Medium Instance
* <ul>
@@ -59,6 +62,7 @@ public class InstanceType {
* </ul>
*/
public static final String M1_MEDIUM = "m1.medium";
+
/**
* Large Instance
* <ul>
@@ -70,6 +74,7 @@ public class InstanceType {
* </ul>
*/
public static final String M1_LARGE = "m1.large";
+
/**
* Extra Large Instance
* <ul>
@@ -81,6 +86,7 @@ public class InstanceType {
* </ul>
*/
public static final String M1_XLARGE = "m1.xlarge";
+
/**
* High-Memory Extra Large Instance
* <ul>
@@ -93,6 +99,7 @@ public class InstanceType {
* </ul>
*/
public static final String M2_XLARGE = "m2.xlarge";
+
/**
* High-Memory Double Extra Large Instance
* <ul>
@@ -105,6 +112,7 @@ public class InstanceType {
* </ul>
*/
public static final String M2_2XLARGE = "m2.2xlarge";
+
/**
* High-Memory Quadruple Extra Large Instance
* <ul>
@@ -117,6 +125,31 @@ public class InstanceType {
* </ul>
*/
public static final String M2_4XLARGE = "m2.4xlarge";
+
+ /**
+ * M3 Medium Instance
+ * <ul>
+ * <li>3.75 GiB memory</li>
+ * <li>3 EC2 Compute Units (1 virtual core with 3 EC2 Compute Units)</li>
+ * <li>1 SSD-based volume with 4 GiB of instance storage</li>
+ * <li>32-bit or 64-bit platform</li>
+ * <li>I/O Performance: Moderate</li>
+ * </ul>
+ */
+ public static final String M3_MEDIUM = "m3.medium";
+
+ /**
+ * M3 Large Instance
+ * <ul>
+ * <li>7 GiB memory</li>
+ * <li>6.5 EC2 Compute Units (2 virtual cores with 3.25 EC2 Compute Units each)</li>
+ * <li>1 SSD-based volume with 32 GiB of instance storage</li>
+ * <li>32-bit or 64-bit platform</li>
+ * <li>I/O Performance: Moderate</li>
+ * </ul>
+ */
+ public static final String M3_LARGE = "m3.large";
+
/**
* M3 Extra Large Instance
* <ul>
@@ -128,6 +161,7 @@ public class InstanceType {
* </ul>
*/
public static final String M3_XLARGE = "m3.xlarge";
+
/**
* M3 Double Extra Large Instance
* <ul>
@@ -139,6 +173,7 @@ public class InstanceType {
* </ul>
*/
public static final String M3_2XLARGE = "m3.2xlarge";
+
/**
* High-CPU Medium Instance
* <ul>
@@ -150,6 +185,7 @@ public class InstanceType {
* </ul>
*/
public static final String C1_MEDIUM = "c1.medium";
+
/**
* High-CPU Extra Large Instance
* <ul>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0625c087/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 e49fff4..0abc94f 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
@@ -18,12 +18,20 @@ package org.jclouds.aws.ec2.compute.suppliers;
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.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.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.i2_2xlarge;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.i2_4xlarge;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.i2_8xlarge;
+import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.i2_xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_large;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_medium;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_small;
@@ -31,8 +39,10 @@ import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m2_2xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m2_4xlarge;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m2_xlarge;
-import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m3_xlarge;
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 java.util.Set;
@@ -70,9 +80,30 @@ public class AWSEC2HardwareSupplier extends EC2HardwareSupplier {
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()));
+
+ sizes.add(t1_micro().build());
+ sizes.add(c1_medium().build());
+ sizes.add(c1_xlarge().build());
+ sizes.add(c3_xlarge().build());
+ sizes.add(c3_2xlarge().build());
+ sizes.add(c3_4xlarge().build());
+ sizes.add(c3_8xlarge().build());
+ sizes.add(i2_xlarge().build());
+ sizes.add(i2_2xlarge().build());
+ sizes.add(i2_4xlarge().build());
+ sizes.add(i2_8xlarge().build());
+ sizes.add(m1_large().build());
+ sizes.add(m1_small().build());
+ sizes.add(m1_medium().build());
+ sizes.add(m1_xlarge().build());
+ sizes.add(m2_xlarge().build());
+ sizes.add(m2_2xlarge().build());
+ sizes.add(m2_4xlarge().build());
+ sizes.add(m3_medium().build());
+ sizes.add(m3_large().build());
+ sizes.add(m3_xlarge().build());
+ sizes.add(m3_2xlarge().build());
+
return sizes.build();
}
}
[3/3] git commit: JCLOUDS-415: Upgrading Guava 15.0 -> 16.0
Posted by an...@apache.org.
JCLOUDS-415: Upgrading Guava 15.0 -> 16.0
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/9e97b7a4
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/9e97b7a4
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/9e97b7a4
Branch: refs/heads/JCLOUDS-415
Commit: 9e97b7a488748688c452b1d64e0c89aed52c031e
Parents: cb3cf41
Author: Andrew Phillips <an...@apache.org>
Authored: Mon Jan 27 14:44:38 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Mon Jan 27 14:44:38 2014 -0500
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9e97b7a4/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 967a3ad..a8ebdac 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -95,7 +95,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
+ <version>16.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
[2/3] git commit: JCLOUDS-415: Preparing for Guava 16.0
Posted by an...@apache.org.
JCLOUDS-415: Preparing for Guava 16.0
Invokable.equals has changed from 15 to 16 so we need to implement the check differently ourselves.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/cb3cf412
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/cb3cf412
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/cb3cf412
Branch: refs/heads/JCLOUDS-415
Commit: cb3cf412b10a13a0c5ffc9829c7b7e30ac1ee49f
Parents: 0625c08
Author: Andrew Phillips <an...@apache.org>
Authored: Fri Jan 24 17:08:05 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Mon Jan 27 14:43:55 2014 -0500
----------------------------------------------------------------------
.../internal/DelegatesToInvocationFunction.java | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/cb3cf412/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
index 280345e..8d94c3e 100644
--- a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
+++ b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
@@ -141,7 +141,7 @@ public class DelegatesToInvocationFunction<S, F extends Function<Invocation, Obj
protected Object handle(Invocation invocation) {
Invokable<?, ?> invokable = invocation.getInvokable();
- if (CLOSE.equals(invokable)) {
+ if (isCloseMethod(invokable)) {
try {
injector.getInstance(Closer.class).close();
return null;
@@ -157,6 +157,22 @@ public class DelegatesToInvocationFunction<S, F extends Function<Invocation, Obj
}
}
+ private static boolean isCloseMethod(Invokable<?, ?> invokable) {
+ /*
+ * Tests equality according to the Javadoc for java.lang.reflect.Method:
+ *
+ * Two Methods are the same if they were declared by the same class
+ * and have the same name and formal parameter types and return type.
+ *
+ * Invokable now uses the *owning* class (not the declaring class) in
+ * its equals check.
+ */
+ return CLOSE.getDeclaringClass().equals(invokable.getDeclaringClass())
+ && CLOSE.getName().equals(invokable.getName())
+ && CLOSE.getParameters().equals(invokable.getParameters())
+ && CLOSE.getReturnType().equals(invokable.getReturnType());
+ }
+
protected final Injector injector;
protected final TypeToken<S> ownerType;
protected final SetCaller setCaller;