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 2014/12/15 23:06:16 UTC
jclouds-labs-google git commit: Bug fixes related to LiveTest failures
Repository: jclouds-labs-google
Updated Branches:
refs/heads/master 2a724044b -> d73562a66
Bug fixes related to LiveTest failures
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/d73562a6
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/d73562a6
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/d73562a6
Branch: refs/heads/master
Commit: d73562a6637a8d76eee3a5ed7dddac2b25701242
Parents: 2a72404
Author: Daniel Broudy <br...@google.com>
Authored: Fri Dec 12 17:01:52 2014 -0800
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Dec 15 23:03:36 2014 +0100
----------------------------------------------------------------------
.../compute/functions/InstanceToNodeMetadata.java | 3 ++-
.../org/jclouds/googlecomputeengine/domain/NewInstance.java | 7 ++++---
google-compute-engine/src/test/resources/instance_insert.json | 4 +++-
.../src/test/resources/instance_insert_2.json | 4 +++-
.../src/test/resources/instance_insert_simple.json | 6 ++++--
5 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d73562a6/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java
index eed9872..5562b48 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java
@@ -30,6 +30,7 @@ import org.jclouds.collect.Memoized;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.NodeMetadataBuilder;
+import org.jclouds.compute.domain.NodeMetadata.Status;
import org.jclouds.compute.functions.GroupNamingConvention;
import org.jclouds.domain.Location;
import org.jclouds.googlecomputeengine.domain.Instance;
@@ -95,7 +96,7 @@ public final class InstanceToNodeMetadata implements Function<Instance, NodeMeta
.location(zone)
.imageId(bootImage != null ? bootImage.toString() : null)
.hardware(hardwares.get().get(input.machineType()))
- .status(toPortableNodeStatus.get(input.status()))
+ .status(input.status() != null ? toPortableNodeStatus.get(input.status()) : Status.UNRECOGNIZED)
.tags(input.tags().items())
.uri(input.selfLink())
.userMetadata(input.metadata().asMap())
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d73562a6/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/NewInstance.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/NewInstance.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/NewInstance.java
index fb45764..57b22a8 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/NewInstance.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/NewInstance.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.List;
import org.jclouds.googlecomputeengine.domain.Instance.NetworkInterface.AccessConfig;
+import org.jclouds.googlecomputeengine.domain.Instance.NetworkInterface.AccessConfig.Type;
import org.jclouds.googlecomputeengine.domain.Instance.Scheduling;
import org.jclouds.googlecomputeengine.domain.Instance.ServiceAccount;
import org.jclouds.javax.annotation.Nullable;
@@ -38,14 +39,14 @@ public abstract class NewInstance {
abstract static class NetworkInterface {
abstract URI network();
- abstract List<AccessConfig.Type> accessConfigs();
+ abstract List<AccessConfig> accessConfigs();
static NetworkInterface create(URI network) {
- return create(network, Arrays.asList(AccessConfig.Type.ONE_TO_ONE_NAT));
+ return create(network, Arrays.asList(AccessConfig.create(null, Type.ONE_TO_ONE_NAT, null)));
}
@SerializedNames({ "network", "accessConfigs" })
- static NetworkInterface create(URI network, List<AccessConfig.Type> accessConfigs) {
+ static NetworkInterface create(URI network, List<AccessConfig> accessConfigs) {
return new AutoValue_NewInstance_NetworkInterface(network, accessConfigs);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d73562a6/google-compute-engine/src/test/resources/instance_insert.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/instance_insert.json b/google-compute-engine/src/test/resources/instance_insert.json
index b26eb06..cc86f84 100644
--- a/google-compute-engine/src/test/resources/instance_insert.json
+++ b/google-compute-engine/src/test/resources/instance_insert.json
@@ -5,7 +5,9 @@
{
"network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/default",
"accessConfigs": [
- "ONE_TO_ONE_NAT"
+ {
+ "type": "ONE_TO_ONE_NAT"
+ }
]
}
],
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d73562a6/google-compute-engine/src/test/resources/instance_insert_2.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/instance_insert_2.json b/google-compute-engine/src/test/resources/instance_insert_2.json
index 99adbfe..78002a6 100644
--- a/google-compute-engine/src/test/resources/instance_insert_2.json
+++ b/google-compute-engine/src/test/resources/instance_insert_2.json
@@ -5,7 +5,9 @@
{
"network": "https://www.googleapis.com/compute/v1/projects/party/networks/jclouds-test",
"accessConfigs": [
- "ONE_TO_ONE_NAT"
+ {
+ "type": "ONE_TO_ONE_NAT"
+ }
]
}
],
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d73562a6/google-compute-engine/src/test/resources/instance_insert_simple.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/instance_insert_simple.json b/google-compute-engine/src/test/resources/instance_insert_simple.json
index c140522..4012c0f 100644
--- a/google-compute-engine/src/test/resources/instance_insert_simple.json
+++ b/google-compute-engine/src/test/resources/instance_insert_simple.json
@@ -5,7 +5,9 @@
{
"network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/default",
"accessConfigs": [
- "ONE_TO_ONE_NAT"
+ {
+ "type": "ONE_TO_ONE_NAT"
+ }
]
}
],
@@ -25,4 +27,4 @@
"metadata": {
"items": []
}
-}
+}
\ No newline at end of file