You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by cc...@apache.org on 2014/10/06 23:47:47 UTC
git commit: JCLOUDS-703: Google Hardware no longer supports images
Repository: jclouds-labs-google
Updated Branches:
refs/heads/1.8.x 35fb45c8c -> 4e068d59c
JCLOUDS-703: Google Hardware no longer supports images
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/4e068d59
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/4e068d59
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/4e068d59
Branch: refs/heads/1.8.x
Commit: 4e068d59c9d08e78da079d47938517eabae357fe
Parents: 35fb45c
Author: Stuart Hendren <st...@tenode.com>
Authored: Thu Sep 11 10:15:57 2014 +0100
Committer: Chris Custine <cc...@apache.org>
Committed: Mon Oct 6 15:43:18 2014 -0600
----------------------------------------------------------------------
.../functions/MachineTypeInZoneToHardware.java | 7 +------
.../googlecomputeengine/domain/MachineType.java | 20 ++++----------------
.../GoogleComputeEngineServiceExpectTest.java | 2 +-
.../parse/ParseMachineTypeListTest.java | 3 ---
.../parse/ParseMachineTypeTest.java | 1 -
.../src/test/resources/machinetype.json | 1 -
.../src/test/resources/machinetype_list.json | 3 ---
.../resources/machinetype_list_central1b.json | 2 --
8 files changed, 6 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4e068d59/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeInZoneToHardware.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeInZoneToHardware.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeInZoneToHardware.java
index 16091cd..e12a4a3 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeInZoneToHardware.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeInZoneToHardware.java
@@ -39,7 +39,6 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.base.Supplier;
-import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
@@ -68,7 +67,6 @@ public class MachineTypeInZoneToHardware implements Function<MachineTypeInZone,
"location for %s",
input.getMachineType().getZone());
- // TODO Figure out a robust way to deal with machineTypes with imageSizeGb==0 rather than just blocking them.
return new HardwareBuilder()
.id(SlashEncodedIds.fromTwoIds(input.getMachineType().getZone(), input.getMachineType().getName()).slashEncode())
.location(location)
@@ -78,11 +76,8 @@ public class MachineTypeInZoneToHardware implements Function<MachineTypeInZone,
.providerId(input.getMachineType().getId())
.ram(input.getMachineType().getMemoryMb())
.uri(input.getMachineType().getSelfLink())
- .userMetadata(ImmutableMap.of("imageSpaceGb", Integer.toString(input.getMachineType().getImageSpaceGb())))
.volumes(collectVolumes(input.getMachineType()))
- .supportsImage(input.getMachineType().getImageSpaceGb() > 0
- ? Predicates.<Image>alwaysTrue()
- : Predicates.<Image>alwaysFalse())
+ .supportsImage(Predicates.<Image>alwaysTrue())
.build();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4e068d59/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java
index 1c59ac7..6a538e5 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java
@@ -42,7 +42,6 @@ public final class MachineType extends Resource {
private final Integer guestCpus;
private final Integer memoryMb;
- private final Integer imageSpaceGb;
private final List<ScratchDisk> scratchDisks;
private final Integer maximumPersistentDisks;
private final Long maximumPersistentDisksSizeGb;
@@ -51,17 +50,15 @@ public final class MachineType extends Resource {
@ConstructorProperties({
"id", "creationTimestamp", "selfLink", "name", "description", "guestCpus", "memoryMb",
- "imageSpaceGb", "scratchDisks", "maximumPersistentDisks", "maximumPersistentDisksSizeGb", "zone",
- "deprecated"
+ "scratchDisks", "maximumPersistentDisks", "maximumPersistentDisksSizeGb", "zone", "deprecated"
})
private MachineType(String id, Date creationTimestamp, URI selfLink, String name, String description,
- int guestCpus, int memoryMb, int imageSpaceGb, List<ScratchDisk> scratchDisks,
+ int guestCpus, int memoryMb, List<ScratchDisk> scratchDisks,
int maximumPersistentDisks, long maximumPersistentDisksSizeGb, String zone,
@Nullable Deprecated deprecated) {
super(Kind.MACHINE_TYPE, id, creationTimestamp, selfLink, name, description);
this.guestCpus = checkNotNull(guestCpus, "guestCpus of %s", name);
this.memoryMb = checkNotNull(memoryMb, "memoryMb of %s", name);
- this.imageSpaceGb = checkNotNull(imageSpaceGb, "imageSpaceGb of %s", name);
this.scratchDisks = scratchDisks == null ? ImmutableList.<ScratchDisk>of() : scratchDisks;
this.maximumPersistentDisks = checkNotNull(maximumPersistentDisks, "maximumPersistentDisks of %s", name);
this.maximumPersistentDisksSizeGb = maximumPersistentDisksSizeGb;
@@ -84,13 +81,6 @@ public final class MachineType extends Resource {
}
/**
- * @return space allotted for the image, defined in GB.
- */
- public int getImageSpaceGb() {
- return imageSpaceGb;
- }
-
- /**
* @return extended scratch disks assigned to the instance.
*/
public List<ScratchDisk> getScratchDisks() {
@@ -145,7 +135,6 @@ public final class MachineType extends Resource {
return super.string()
.add("guestCpus", guestCpus)
.add("memoryMb", memoryMb)
- .add("imageSpaceGb", imageSpaceGb)
.add("scratchDisks", scratchDisks)
.add("maximumPersistentDisks", maximumPersistentDisks)
.add("maximumPersistentDisksSizeGb", maximumPersistentDisksSizeGb)
@@ -259,13 +248,12 @@ public final class MachineType extends Resource {
public MachineType build() {
return new MachineType(id, creationTimestamp, selfLink, name, description, guestCpus, memoryMb,
- imageSpaceGb, scratchDisks.build(), maximumPersistentDisks, maximumPersistentDisksSizeGb,
- zone, deprecated);
+ scratchDisks.build(), maximumPersistentDisks, maximumPersistentDisksSizeGb, zone, deprecated);
}
public Builder fromMachineType(MachineType in) {
- return super.fromResource(in).memoryMb(in.getMemoryMb()).imageSpaceGb(in.getImageSpaceGb()).scratchDisks(in
+ return super.fromResource(in).memoryMb(in.getMemoryMb()).scratchDisks(in
.getScratchDisks()).maximumPersistentDisks(in.getMaximumPersistentDisks())
.maximumPersistentDisksSizeGb(in.getMaximumPersistentDisksSizeGb()).zone(in.getZone())
.deprecated(in.getDeprecated().orNull());
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4e068d59/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
index f559703..885289f 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
@@ -214,7 +214,7 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromStringWithContentType("{\"name\":\"" + instanceName + "\"," +
"\"machineType\":\"https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1\"," +
+ ".com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/f1-micro\"," +
"\"serviceAccounts\":[]," +
"\"networkInterfaces\":[{\"network\":\"https://www.googleapis" +
".com/compute/v1/projects/myproject/global/networks/" + networkName + "\"," +
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4e068d59/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java
index ace1ca8..f8146d2 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java
@@ -54,7 +54,6 @@ public class ParseMachineTypeListTest extends BaseGoogleComputeEngineParseTest<L
.description("1 vCPU (shared physical core) and 0.6 GB RAM")
.guestCpus(1)
.memoryMb(614)
- .imageSpaceGb(0)
.maximumPersistentDisks(4)
.maximumPersistentDisksSizeGb(3072)
.build())
@@ -68,7 +67,6 @@ public class ParseMachineTypeListTest extends BaseGoogleComputeEngineParseTest<L
.description("1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk")
.guestCpus(1)
.memoryMb(3840)
- .imageSpaceGb(10)
.maximumPersistentDisks(16)
.maximumPersistentDisksSizeGb(128)
.build())
@@ -83,7 +81,6 @@ public class ParseMachineTypeListTest extends BaseGoogleComputeEngineParseTest<L
"and 2 extra 1770 GB ephemeral disks")
.guestCpus(8)
.memoryMb(30720)
- .imageSpaceGb(10)
.addScratchDisk(1770)
.addScratchDisk(1770)
.maximumPersistentDisks(16)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4e068d59/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java
index 2995c35..c1f1fad 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java
@@ -47,7 +47,6 @@ public class ParseMachineTypeTest extends BaseGoogleComputeEngineParseTest<Machi
.description("1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk")
.guestCpus(1)
.memoryMb(3840)
- .imageSpaceGb(10)
.addScratchDisk(1770)
.addScratchDisk(1770)
.maximumPersistentDisks(16)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4e068d59/google-compute-engine/src/test/resources/machinetype.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/machinetype.json b/google-compute-engine/src/test/resources/machinetype.json
index 01692b3..f02f334 100644
--- a/google-compute-engine/src/test/resources/machinetype.json
+++ b/google-compute-engine/src/test/resources/machinetype.json
@@ -7,7 +7,6 @@
"description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
"guestCpus": 1,
"memoryMb": 3840,
- "imageSpaceGb": 10,
"scratchDisks": [
{
"diskGb": 1770
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4e068d59/google-compute-engine/src/test/resources/machinetype_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/machinetype_list.json b/google-compute-engine/src/test/resources/machinetype_list.json
index 9acb7e0..cb20853 100644
--- a/google-compute-engine/src/test/resources/machinetype_list.json
+++ b/google-compute-engine/src/test/resources/machinetype_list.json
@@ -11,7 +11,6 @@
"description": "1 vCPU (shared physical core) and 0.6 GB RAM",
"guestCpus": 1,
"memoryMb": 614,
- "imageSpaceGb": 0,
"maximumPersistentDisks": 4,
"maximumPersistentDisksSizeGb": "3072",
"zone": "us-central1-a",
@@ -26,7 +25,6 @@
"description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
"guestCpus": 1,
"memoryMb": 3840,
- "imageSpaceGb": 10,
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "128",
"zone": "us-central1-a"
@@ -40,7 +38,6 @@
"description": "8 vCPUs, 30 GB RAM, a 10 GB ephemeral root disk, and 2 extra 1770 GB ephemeral disks",
"guestCpus": 8,
"memoryMb": 30720,
- "imageSpaceGb": 10,
"scratchDisks": [
{
"diskGb": 1770
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4e068d59/google-compute-engine/src/test/resources/machinetype_list_central1b.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/machinetype_list_central1b.json b/google-compute-engine/src/test/resources/machinetype_list_central1b.json
index fe5974a..8cbbc48 100644
--- a/google-compute-engine/src/test/resources/machinetype_list_central1b.json
+++ b/google-compute-engine/src/test/resources/machinetype_list_central1b.json
@@ -12,7 +12,6 @@
"description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
"guestCpus": 1,
"memoryMb": 3840,
- "imageSpaceGb": 10,
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "128",
"zone": "us-central1-b"
@@ -26,7 +25,6 @@
"description": "8 vCPUs, 30 GB RAM, a 10 GB ephemeral root disk, and 2 extra 1770 GB ephemeral disks",
"guestCpus": 8,
"memoryMb": 30720,
- "imageSpaceGb": 10,
"scratchDisks": [
{
"diskGb": 1770