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/01/09 23:21:18 UTC

[3/3] jclouds-labs-google git commit: Fixed InstanceApiLiveTest, made Instance.status @Nullable

Fixed InstanceApiLiveTest, made Instance.status @Nullable


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/0391f699
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/0391f699
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/0391f699

Branch: refs/heads/master
Commit: 0391f699e9c4a71b5b4625ab82af8cae99f472e2
Parents: fff69b6
Author: Daniel Broudy <br...@google.com>
Authored: Tue Jan 6 15:25:41 2015 -0800
Committer: Ignasi Barrera <na...@apache.org>
Committed: Fri Jan 9 23:19:33 2015 +0100

----------------------------------------------------------------------
 .../java/org/jclouds/googlecomputeengine/domain/Instance.java | 2 +-
 .../googlecomputeengine/features/InstanceApiLiveTest.java     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/0391f699/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java
index cdc2ee4..dcbc344 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java
@@ -225,7 +225,7 @@ public abstract class Instance {
 
    public abstract URI machineType();
 
-   public abstract Status status();
+   @Nullable public abstract Status status();
 
    /** Human-readable explanation of the status. */
    @Nullable public abstract String statusMessage();

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/0391f699/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
index 9add978..1910282 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
@@ -126,9 +126,14 @@ public class InstanceApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
 
    @Test(groups = "live", dependsOnMethods = "testInsertInstance")
    public void testAddAccessConfig() {
+      Instance instance = api().get(INSTANCE_NAME);
+      assertNotNull(instance);
+      assertOperationDoneSuccessfully(api().deleteAccessConfigFromNic(INSTANCE_NAME,
+            instance.networkInterfaces().get(0).accessConfigs().get(0).name(), "nic0"));
+
       AccessConfig config = AccessConfig.create("test-config", Type.ONE_TO_ONE_NAT, null);
       assertOperationDoneSuccessfully(api().addAccessConfigToNic(INSTANCE_NAME, config, "nic0"));
-      Instance instance = api().get(INSTANCE_NAME);
+      instance = api().get(INSTANCE_NAME);
       assertNotNull(instance);
       assertEquals(instance.networkInterfaces().get(0).accessConfigs().get(0).name(), "test-config");
    }