You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/06/26 14:45:19 UTC
[44/50] [abbrv] jclouds git commit: JCLOUDS-935. Move
AttachDisk.InitializeParams to URI for diskType
JCLOUDS-935. Move AttachDisk.InitializeParams to URI for diskType
Note that two tests are failing right now with or without this.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6d850a8a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6d850a8a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6d850a8a
Branch: refs/heads/master
Commit: 6d850a8aee5bae14695988077ae1aa46dc406fed
Parents: 012e188
Author: Andrew Bayer <an...@gmail.com>
Authored: Thu Jun 11 14:07:24 2015 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Fri Jun 12 09:12:23 2015 -0700
----------------------------------------------------------------------
.../jclouds/googlecomputeengine/domain/AttachDisk.java | 4 ++--
.../googlecomputeengine/features/InstanceApiMockTest.java | 2 +-
.../googlecomputeengine/parse/ParseInstanceTest.java | 10 ++++------
.../src/test/resources/instance_attach_disk.json | 2 +-
.../src/test/resources/instance_get.json | 2 +-
.../src/test/resources/instance_list.json | 2 +-
6 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6d850a8a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AttachDisk.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AttachDisk.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AttachDisk.java
index 6306715..198b815 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AttachDisk.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AttachDisk.java
@@ -37,14 +37,14 @@ public abstract class AttachDisk {
/** The {@link org.jclouds.googlecomputeengine.domain.Image#selfLink() source image}. */
public abstract URI sourceImage();
- @Nullable public abstract String diskType();
+ @Nullable public abstract URI diskType();
static InitializeParams create(URI sourceImage) {
return create(null, null, sourceImage, null);
}
@SerializedNames({ "diskName", "diskSizeGb", "sourceImage", "diskType" })
- public static InitializeParams create(String diskName, Long diskSizeGb, URI sourceImage, String diskType) {
+ public static InitializeParams create(String diskName, Long diskSizeGb, URI sourceImage, URI diskType) {
return new AutoValue_AttachDisk_InitializeParams(diskName, diskSizeGb, sourceImage, diskType);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6d850a8a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java
index 2c19324..5cbc78f 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java
@@ -195,7 +195,7 @@ public class InstanceApiMockTest extends BaseGoogleComputeEngineApiMockTest {
"test", // diskName
Long.parseLong("100", 10), // diskSizeGb
URI.create(url("/projects/party/global/images/test")), // sourceImage
- "pd-standard" // diskType
+ URI.create(url("/projects/party/zones/us-central1-a/diskTypes/pd-standard")) // diskType
), // initializeParams
true, // autoDelete
ImmutableList.of(url("/projects/suse-cloud/global/licenses/sles-12")), // licenses
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6d850a8a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java
index aa71275..651de37 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java
@@ -18,24 +18,22 @@ package org.jclouds.googlecomputeengine.parse;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import java.net.URI;
-
import javax.ws.rs.Consumes;
+import java.net.URI;
+import com.google.common.collect.ImmutableList;
import org.jclouds.googlecomputeengine.domain.AttachDisk;
import org.jclouds.googlecomputeengine.domain.AttachDisk.DiskInterface;
import org.jclouds.googlecomputeengine.domain.Instance;
import org.jclouds.googlecomputeengine.domain.Instance.AttachedDisk;
import org.jclouds.googlecomputeengine.domain.Instance.NetworkInterface;
-import org.jclouds.googlecomputeengine.domain.Instance.ServiceAccount;
import org.jclouds.googlecomputeengine.domain.Instance.Scheduling.OnHostMaintenance;
+import org.jclouds.googlecomputeengine.domain.Instance.ServiceAccount;
import org.jclouds.googlecomputeengine.domain.Metadata;
import org.jclouds.googlecomputeengine.domain.Tags;
import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
import org.testng.annotations.Test;
-import com.google.common.collect.ImmutableList;
-
@Test(groups = "unit", testName = "ParseInstanceTest")
public class ParseInstanceTest extends BaseGoogleComputeEngineParseTest<Instance> {
@@ -81,7 +79,7 @@ public class ParseInstanceTest extends BaseGoogleComputeEngineParseTest<Instance
"test", // diskName
Long.parseLong("100", 10), // diskSizeGb
URI.create(baseUrl + "/party/global/images/test"), // sourceImage
- "pd-standard" // diskType
+ URI.create(baseUrl + "/party/zones/us-central1-a/diskTypes/pd-standard") // diskType
), // initializeParams
ImmutableList.of(baseUrl + "/suse-cloud/global/licenses/sles-12"), // licenses
DiskInterface.NVME // interface
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6d850a8a/providers/google-compute-engine/src/test/resources/instance_attach_disk.json
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/resources/instance_attach_disk.json b/providers/google-compute-engine/src/test/resources/instance_attach_disk.json
index 3738015..f7cb2cf 100644
--- a/providers/google-compute-engine/src/test/resources/instance_attach_disk.json
+++ b/providers/google-compute-engine/src/test/resources/instance_attach_disk.json
@@ -9,7 +9,7 @@
"diskName": "test",
"sourceImage": "https://www.googleapis.com/compute/v1/projects/party/global/images/test",
"diskSizeGb": 100,
- "diskType": "pd-standard"
+ "diskType": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/diskTypes/pd-standard"
},
"licenses": [
"https://www.googleapis.com/compute/v1/projects/suse-cloud/global/licenses/sles-12"
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6d850a8a/providers/google-compute-engine/src/test/resources/instance_get.json
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/resources/instance_get.json b/providers/google-compute-engine/src/test/resources/instance_get.json
index afe7ae8..b2795b6 100644
--- a/providers/google-compute-engine/src/test/resources/instance_get.json
+++ b/providers/google-compute-engine/src/test/resources/instance_get.json
@@ -30,7 +30,7 @@
"diskName": "test",
"sourceImage": "https://www.googleapis.com/compute/v1/projects/party/global/images/test",
"diskSizeGb": "100",
- "diskType": "pd-standard"
+ "diskType": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/diskTypes/pd-standard"
},
"licenses": [
"https://www.googleapis.com/compute/v1/projects/suse-cloud/global/licenses/sles-12"
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6d850a8a/providers/google-compute-engine/src/test/resources/instance_list.json
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/resources/instance_list.json b/providers/google-compute-engine/src/test/resources/instance_list.json
index ed277f3..ee31a1a 100644
--- a/providers/google-compute-engine/src/test/resources/instance_list.json
+++ b/providers/google-compute-engine/src/test/resources/instance_list.json
@@ -35,7 +35,7 @@
"diskName": "test",
"sourceImage": "https://www.googleapis.com/compute/v1/projects/party/global/images/test",
"diskSizeGb": "100",
- "diskType": "pd-standard"
+ "diskType": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/diskTypes/pd-standard"
},
"licenses": [
"https://www.googleapis.com/compute/v1/projects/suse-cloud/global/licenses/sles-12"