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/02/11 17:30:33 UTC
jclouds-labs-google git commit: adding start and stop to Instance Api
Repository: jclouds-labs-google
Updated Branches:
refs/heads/master e6f6675b0 -> 17fb520c2
adding start and stop to Instance Api
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/17fb520c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/17fb520c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/17fb520c
Branch: refs/heads/master
Commit: 17fb520c223ea4728aef57e26addc3bc71dfa890
Parents: e6f6675
Author: Daniel Broudy <br...@google.com>
Authored: Thu Feb 5 17:46:30 2015 -0800
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Feb 11 17:25:44 2015 +0100
----------------------------------------------------------------------
.../features/InstanceApi.java | 24 ++++++++++++++++
.../features/InstanceApiLiveTest.java | 29 +++++++++++++++++++-
.../features/InstanceApiMockTest.java | 18 ++++++++++++
3 files changed, 70 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/17fb520c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java
index 03e690b..5405de2 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java
@@ -253,6 +253,30 @@ public interface InstanceApi {
@PayloadParam("automaticRestart") boolean automaticRestart);
/**
+ * This method starts an instance that was stopped using the using the {@link #stop(String)} method.
+ * @param instance - name of the instance to be started
+ */
+ @Named("Instances:start")
+ @POST
+ @Path("/{instance}/start")
+ @Produces(APPLICATION_JSON)
+ Operation start(@PathParam("instance") String instance);
+
+ /**
+ * This method stops a running instance, shutting it down cleanly, and allows you to restart
+ * the instance at a later time. Stopped instances do not incur per-minute, virtual machine
+ * usage charges while they are stopped, but any resources that the virtual machine is using,
+ * such as persistent disks and static IP addresses,will continue to be charged until they are deleted.
+ * @param instance
+ * @return
+ */
+ @Named("Instances:stop")
+ @POST
+ @Path("/{instance}/stop")
+ @Produces(APPLICATION_JSON)
+ Operation stop(@PathParam("instance") String instance);
+
+ /**
* Retrieves the list of instance resources available to the specified project.
* By default the list as a maximum size of 100, if no options are provided or ListOptions#getMaxResults() has not
* been set.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/17fb520c/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 1910282..266d759 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
@@ -56,6 +56,7 @@ public class InstanceApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
private static final String INSTANCE_NETWORK_NAME = "instance-api-live-test-network";
private static final String INSTANCE_NAME = "instance-api-test-instance-1";
+ private static final String INSTANCE_NAME2 = "instance-api-test-instance-2";
private static final String DISK_NAME = "instance-live-test-disk";
private static final String IPV4_RANGE = "10.0.0.0/8";
private static final String METADATA_ITEM_KEY = "instanceLiveTestTestProp";
@@ -68,6 +69,7 @@ public class InstanceApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
private static final String DEFAULT_BOOT_DISK_NAME = "persistent-disk-0";
private NewInstance instance;
+ private NewInstance instance2;
@Override
protected GoogleComputeEngineApi create(Properties props, Iterable<Module> modules) {
@@ -95,6 +97,13 @@ public class InstanceApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
);
instance.tags().items().addAll(Arrays.asList("foo", "bar"));
instance.metadata().put("mykey", "myvalue");
+
+ instance2 = NewInstance.create(
+ INSTANCE_NAME2, // name
+ getDefaultMachineTypeUrl(), // machineType
+ getNetworkUrl(INSTANCE_NETWORK_NAME), // network
+ imageUri); // sourceImage
+
return api;
}
@@ -115,6 +124,7 @@ public class InstanceApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertOperationDoneSuccessfully(diskApi().create(DISK_NAME,
new DiskCreationOptions().sizeGb(DEFAULT_DISK_SIZE_GB)));
assertOperationDoneSuccessfully(api().create(instance));
+ assertOperationDoneSuccessfully(api().create(instance2));
}
@Test(groups = "live", dependsOnMethods = "testInsertInstance")
@@ -283,10 +293,27 @@ public class InstanceApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertOperationDoneSuccessfully(api().reset(INSTANCE_NAME));
}
+ @Test(groups = "live", dependsOnMethods = "testInsertInstance")
+ public void testStopInstance() {
+ Instance originalInstance = api().get(INSTANCE_NAME2);
+ assertEquals(originalInstance.status(), Instance.Status.RUNNING);
+ assertOperationDoneSuccessfully(api().stop(INSTANCE_NAME2));
+ }
+
+ @Test(groups = "live", dependsOnMethods = "testStopInstance")
+ public void testStartInstance() {
+ Instance originalInstance = api().get(INSTANCE_NAME2);
+ assertEquals(originalInstance.status(), Instance.Status.TERMINATED);
+ assertOperationDoneSuccessfully(api().start(INSTANCE_NAME2));
+ originalInstance = api().get(INSTANCE_NAME2);
+ assertEquals(originalInstance.status(), Instance.Status.RUNNING);
+ }
+
@Test(groups = "live", dependsOnMethods = {"testSetDiskAutoDelete", "testResetInstance", "testSetScheduling",
- "testGetInstance", "testGetSerialPortOutput", "testDeleteAccessConfig"}, alwaysRun = true)
+ "testGetInstance", "testGetSerialPortOutput", "testDeleteAccessConfig", "testStartInstance"}, alwaysRun = true)
public void testDeleteInstance() {
assertOperationDoneSuccessfully(api().delete(INSTANCE_NAME));
+ assertOperationDoneSuccessfully(api().delete(INSTANCE_NAME2));
assertOperationDoneSuccessfully(diskApi().delete(DISK_NAME));
Operation deleteNetwork = api.networks().delete(INSTANCE_NETWORK_NAME);
assertOperationDoneSuccessfully(deleteNetwork);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/17fb520c/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java
index db3f6eb..ee1b08d 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java
@@ -231,6 +231,24 @@ public class InstanceApiMockTest extends BaseGoogleComputeEngineApiMockTest {
"{\"onHostMaintenance\": \"TERMINATE\",\"automaticRestart\": true}");
}
+ public void start_test() throws Exception {
+ server.enqueue(jsonResponse("/zone_operation.json"));
+
+ assertEquals(instanceApi().start("test-1"),
+ new ParseZoneOperationTest().expected(url("/projects")));
+
+ assertSent(server, "POST", "/projects/party/zones/us-central1-a/instances/test-1/start");
+ }
+
+ public void stop_test() throws Exception {
+ server.enqueue(jsonResponse("/zone_operation.json"));
+
+ assertEquals(instanceApi().stop("test-1"),
+ new ParseZoneOperationTest().expected(url("/projects")));
+
+ assertSent(server, "POST", "/projects/party/zones/us-central1-a/instances/test-1/stop");
+ }
+
InstanceApi instanceApi(){
return api().instancesInZone("us-central1-a");
}