You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/12/23 05:26:40 UTC
[16/51] [partial] stratos git commit: dropping jclouds 1.8.0 clone
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiExpectTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiExpectTest.java
deleted file mode 100644
index 7fac1d7..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiExpectTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.googlecomputeengine.parse.ParseOperationListTest;
-import org.jclouds.googlecomputeengine.parse.ParseOperationTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class GlobalOperationApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
-
- private static final String OPERATIONS_URL_PREFIX = "https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/operations";
-
- public static final HttpRequest GET_GLOBAL_OPERATION_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint(OPERATIONS_URL_PREFIX + "/operation-1354084865060-4cf88735faeb8-bbbb12cb")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse GET_GLOBAL_OPERATION_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/global_operation.json")).build();
-
- public void testGetOperationResponseIs2xx() throws Exception {
-
- GlobalOperationApi operationApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, GET_GLOBAL_OPERATION_REQUEST, GET_GLOBAL_OPERATION_RESPONSE).getGlobalOperationApiForProject("myproject");
-
- assertEquals(operationApi.get("operation-1354084865060-4cf88735faeb8-bbbb12cb"),
- new ParseOperationTest().expected());
- }
-
- public void testGetOperationResponseIs4xx() throws Exception {
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- GlobalOperationApi globalOperationApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, GET_GLOBAL_OPERATION_REQUEST, operationResponse).getGlobalOperationApiForProject("myproject");
-
- assertNull(globalOperationApi.get("operation-1354084865060-4cf88735faeb8-bbbb12cb"));
- }
-
- public void testDeleteOperationResponseIs2xx() throws Exception {
- HttpRequest delete = HttpRequest
- .builder()
- .method("DELETE")
- .endpoint(OPERATIONS_URL_PREFIX + "/operation-1352178598164-4cdcc9d031510-4aa46279")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(204).build();
-
- GlobalOperationApi globalOperationApi = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, delete, operationResponse).getGlobalOperationApiForProject("myproject");
-
- globalOperationApi.delete("operation-1352178598164-4cdcc9d031510-4aa46279");
- }
-
- public void testDeleteOperationResponseIs4xx() throws Exception {
- HttpRequest delete = HttpRequest
- .builder()
- .method("DELETE")
- .endpoint(OPERATIONS_URL_PREFIX + "/operation-1352178598164-4cdcc9d031510-4aa46279")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- GlobalOperationApi globalOperationApi = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, delete, operationResponse).getGlobalOperationApiForProject("myproject");
-
- globalOperationApi.delete("operation-1352178598164-4cdcc9d031510-4aa46279");
- }
-
- public void testLisOperationWithNoOptionsResponseIs2xx() {
- HttpRequest get = HttpRequest
- .builder()
- .method("GET")
- .endpoint(OPERATIONS_URL_PREFIX)
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/global_operation_list.json")).build();
-
- GlobalOperationApi globalOperationApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, get, operationResponse).getGlobalOperationApiForProject("myproject");
-
- assertEquals(globalOperationApi.listFirstPage().toString(),
- new ParseOperationListTest().expected().toString());
- }
-
- public void testListOperationWithPaginationOptionsResponseIs2xx() {
- HttpRequest get = HttpRequest
- .builder()
- .method("GET")
- .endpoint(OPERATIONS_URL_PREFIX +
- "?pageToken=CglPUEVSQVRJT04SOzU5MDQyMTQ4Nzg1Mi5vcG" +
- "VyYXRpb24tMTM1MjI0NDI1ODAzMC00Y2RkYmU2YTJkNmIwLWVkMzIyMzQz&" +
- "filter=" +
- "status%20eq%20done&" +
- "maxResults=3")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/global_operation_list.json")).build();
-
- GlobalOperationApi globalOperationApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, get, operationResponse).getGlobalOperationApiForProject("myproject");
-
- assertEquals(globalOperationApi.listAtMarker("CglPUEVSQVRJT04SOzU5MDQyMTQ4Nzg1Mi5vcGVyYXRpb24tMTM1Mj" +
- "I0NDI1ODAzMC00Y2RkYmU2YTJkNmIwLWVkMzIyMzQz",
- new ListOptions.Builder().filter("status eq done").maxResults(3)).toString(),
- new ParseOperationListTest().expected().toString());
- }
-
- public void testListOperationWithPaginationOptionsResponseIs4xx() {
- HttpRequest get = HttpRequest
- .builder()
- .method("GET")
- .endpoint(OPERATIONS_URL_PREFIX)
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- GlobalOperationApi globalOperationApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, get, operationResponse).getGlobalOperationApiForProject("myproject");
-
- assertTrue(globalOperationApi.list().concat().isEmpty());
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiLiveTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiLiveTest.java
deleted file mode 100644
index 704df02..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiLiveTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.features.ProjectApiLiveTest.addItemToMetadata;
-import static org.jclouds.googlecomputeengine.features.ProjectApiLiveTest.deleteItemFromMetadata;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.jclouds.collect.IterableWithMarker;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiLiveTest;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-public class GlobalOperationApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
-
- private static final String METADATA_ITEM_KEY = "operationLiveTestTestProp";
- private static final String METADATA_ITEM_VALUE = "operationLiveTestTestValue";
- private Operation addOperation;
- private Operation deleteOperation;
-
- private GlobalOperationApi api() {
- return api.getGlobalOperationApiForProject(userProject.get());
- }
-
-
- @Test(groups = "live")
- public void testCreateOperations() {
- //create some operations by adding and deleting metadata items
- // this will make sure there is stuff to listFirstPage
- addOperation = assertGlobalOperationDoneSucessfully(addItemToMetadata(api.getProjectApi(),
- userProject.get(), METADATA_ITEM_KEY, METADATA_ITEM_VALUE), 20);
- deleteOperation = assertGlobalOperationDoneSucessfully(deleteItemFromMetadata(api
- .getProjectApi(), userProject.get(), METADATA_ITEM_KEY), 20);
-
- assertNotNull(addOperation);
- assertNotNull(deleteOperation);
- }
-
- @Test(groups = "live", dependsOnMethods = "testCreateOperations")
- public void testGetOperation() {
- Operation operation = api().get(addOperation.getName());
- assertNotNull(operation);
- assertOperationEquals(operation, this.addOperation);
- }
-
- @Test(groups = "live", dependsOnMethods = "testCreateOperations")
- public void testListOperationsWithFiltersAndPagination() {
- PagedIterable<Operation> operations = api().list(new ListOptions.Builder()
- .filter("operationType eq setMetadata")
- .maxResults(1));
-
- // make sure that in spite of having only one result per page we get at least two results
- final AtomicInteger counter = new AtomicInteger();
- operations.firstMatch(new Predicate<IterableWithMarker<Operation>>() {
-
- @Override
- public boolean apply(IterableWithMarker<Operation> input) {
- counter.addAndGet(Iterables.size(input));
- return counter.get() == 2;
- }
- });
- }
-
- private void assertOperationEquals(Operation result, Operation expected) {
- assertEquals(result.getName(), expected.getName());
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java
deleted file mode 100644
index 6001c24..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.AssertJUnit.assertNull;
-
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;
-import org.jclouds.googlecomputeengine.parse.ParseImageListTest;
-import org.jclouds.googlecomputeengine.parse.ParseImageTest;
-import org.jclouds.googlecomputeengine.parse.ParseOperationTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class ImageApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
-
- public static final HttpRequest LIST_PROJECT_IMAGES_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/images")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse LIST_PROJECT_IMAGES_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/image_list.json")).build();
-
- public static final HttpRequest LIST_CENTOS_IMAGES_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse LIST_CENTOS_IMAGES_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/image_list_single_page.json")).build();
-
- public static final HttpRequest LIST_DEBIAN_IMAGES_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse LIST_DEBIAN_IMAGES_RESPONSE =
- HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/image_list_empty.json")).build();
-
- public void testGetImageResponseIs2xx() throws Exception {
- HttpRequest get = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/centos-cloud/global/images/centos-6-2-v20120326")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/image_get.json")).build();
-
- ImageApi imageApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, get, operationResponse).getImageApiForProject("centos-cloud");
-
- assertEquals(imageApi.get("centos-6-2-v20120326"),
- new ParseImageTest().expected());
- }
-
- public void testGetImageResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/centos-cloud/global/images/centos-6-2-v20120326")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- ImageApi imageApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, get, operationResponse).getImageApiForProject("centos-cloud");
-
- assertNull(imageApi.get("centos-6-2-v20120326"));
- }
-
- public void testDeleteImageResponseIs2xx() {
- HttpRequest delete = HttpRequest
- .builder()
- .method("DELETE")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/images/centos-6-2-v20120326")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse deleteResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/operation.json")).build();
-
- ImageApi imageApi = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, delete, deleteResponse).getImageApiForProject("myproject");
-
- assertEquals(imageApi.delete("centos-6-2-v20120326"),
- new ParseOperationTest().expected());
- }
-
- public void testDeleteImageResponseIs4xx() {
- HttpRequest delete = HttpRequest
- .builder()
- .method("DELETE")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/images/centos-6-2-v20120326")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse deleteResponse = HttpResponse.builder().statusCode(404).build();
-
- ImageApi imageApi = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, delete, deleteResponse).getImageApiForProject("myproject");
-
- assertNull(imageApi.delete("centos-6-2-v20120326"));
- }
-
- public void testListImagesResponseIs2xx() {
-
- ImageApi imageApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, LIST_PROJECT_IMAGES_REQUEST, LIST_PROJECT_IMAGES_RESPONSE).getImageApiForProject
- ("myproject");
-
- assertEquals(imageApi.listFirstPage().toString(),
- new ParseImageListTest().expected().toString());
- }
-
- public void testListImagesResponseIs4xx() {
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- ImageApi imageApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, LIST_PROJECT_IMAGES_REQUEST, operationResponse).getImageApiForProject("myproject");
-
- assertTrue(imageApi.list().concat().isEmpty());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiLiveTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiLiveTest.java
deleted file mode 100644
index a4922b4..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiLiveTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.jclouds.collect.IterableWithMarker;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.Image;
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiLiveTest;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-public class ImageApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
-
- private Image image;
-
- private ImageApi api() {
- return api.getImageApiForProject("centos-cloud");
- }
-
- @Test(groups = "live")
- public void testListImage() {
-
- PagedIterable<Image> images = api().list(new ListOptions.Builder().maxResults(1));
-
- Iterator<IterableWithMarker<Image>> pageIterator = images.iterator();
- assertTrue(pageIterator.hasNext());
-
- IterableWithMarker<Image> singlePageIterator = pageIterator.next();
- List<Image> imageAsList = Lists.newArrayList(singlePageIterator);
-
- assertSame(imageAsList.size(), 1);
-
- this.image = Iterables.getOnlyElement(imageAsList);
- }
-
-
- @Test(groups = "live", dependsOnMethods = "testListImage")
- public void testGetImage() {
- Image image = api().get(this.image.getName());
- assertNotNull(image);
- assertImageEquals(image, this.image);
- }
-
- private void assertImageEquals(Image result, Image expected) {
- assertEquals(result.getName(), expected.getName());
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiExpectTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiExpectTest.java
deleted file mode 100644
index f460de6..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiExpectTest.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static java.net.URI.create;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-import static org.jclouds.googlecomputeengine.features.ProjectApiExpectTest.GET_PROJECT_REQUEST;
-import static org.jclouds.googlecomputeengine.features.ProjectApiExpectTest.GET_PROJECT_RESPONSE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.AssertJUnit.assertNull;
-
-import java.net.URI;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.googlecomputeengine.domain.Instance;
-import org.jclouds.googlecomputeengine.domain.InstanceTemplate;
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;
-import org.jclouds.googlecomputeengine.options.AttachDiskOptions;
-import org.jclouds.googlecomputeengine.options.AttachDiskOptions.DiskMode;
-import org.jclouds.googlecomputeengine.options.AttachDiskOptions.DiskType;
-import org.jclouds.googlecomputeengine.parse.ParseInstanceListTest;
-import org.jclouds.googlecomputeengine.parse.ParseInstanceSerialOutputTest;
-import org.jclouds.googlecomputeengine.parse.ParseInstanceTest;
-import org.jclouds.googlecomputeengine.parse.ParseOperationTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-
-@Test(groups = "unit")
-public class InstanceApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
-
- public static final HttpRequest GET_INSTANCE_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
-
- public static final HttpResponse GET_INSTANCE_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/instance_get.json")).build();
-
- public static final HttpRequest LIST_INSTANCES_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse LIST_INSTANCES_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/instance_list.json")).build();
-
- public static final HttpRequest LIST_CENTRAL1B_INSTANCES_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-b/instances")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse LIST_CENTRAL1B_INSTANCES_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/instance_list_central1b_empty.json")).build();
-
- public static final HttpResponse CREATE_INSTANCE_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/zone_operation.json")).build();
-
-
- public void testGetInstanceResponseIs2xx() throws Exception {
-
- InstanceApi api = requestsSendResponses(
- requestForScopes(COMPUTE_READONLY_SCOPE), TOKEN_RESPONSE,
- GET_INSTANCE_REQUEST, GET_INSTANCE_RESPONSE).getInstanceApiForProject("myproject");
-
- assertEquals(api.getInZone("us-central1-a", "test-1"), new ParseInstanceTest().expected());
- }
-
- public void testGetInstanceResponseIs4xx() throws Exception {
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, GET_INSTANCE_REQUEST, operationResponse).getInstanceApiForProject("myproject");
-
- assertNull(api.getInZone("us-central1-a", "test-1"));
- }
-
- public void testGetInstanceSerialPortOutput() throws Exception {
- HttpRequest get = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/serialPort")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/instance_serial_port.json")).build();
-
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, get, operationResponse).getInstanceApiForProject("myproject");
-
- assertEquals(api.getSerialPortOutputInZone("us-central1-a", "test-1"), new ParseInstanceSerialOutputTest().expected());
- }
-
- public void testInsertInstanceResponseIs2xxNoOptions() {
- HttpRequest insert = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/instance_insert_simple.json", MediaType.APPLICATION_JSON))
- .build();
-
- InstanceApi api = requestsSendResponses(ImmutableMap.of(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, GET_PROJECT_REQUEST, GET_PROJECT_RESPONSE,
- requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, insert,
- CREATE_INSTANCE_RESPONSE)).getInstanceApiForProject("myproject");
-
- InstanceTemplate options = InstanceTemplate.builder().forMachineType("us-central1-a/n1-standard-1")
- .addNetworkInterface(URI.create("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/networks/default"));
-
- assertEquals(api.createInZone("test-1", "us-central1-a", options), new ParseOperationTest().expected());
- }
-
- public void testInsertInstanceResponseIs2xxAllOptions() {
- HttpRequest insert = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/instance_insert.json", MediaType.APPLICATION_JSON))
- .build();
-
- HttpResponse insertInstanceResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/zone_operation.json")).build();
-
- InstanceApi api = requestsSendResponses(ImmutableMap.of(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, GET_PROJECT_REQUEST, GET_PROJECT_RESPONSE,
- requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, insert, insertInstanceResponse)).getInstanceApiForProject("myproject");
-
- InstanceTemplate options = InstanceTemplate.builder().forMachineType("us-central1-a/n1-standard-1")
- .addNetworkInterface(URI.create("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/networks/default"), Instance.NetworkInterface.AccessConfig.Type.ONE_TO_ONE_NAT)
- .description("desc")
- .addDisk(InstanceTemplate.PersistentDisk.Mode.READ_WRITE,
- create("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/test"),
- true)
- .addServiceAccount(Instance.ServiceAccount.builder().email("default").addScopes("myscope").build())
- .addMetadata("aKey", "aValue");
-
- assertEquals(api.createInZone("test-0", "us-central1-a", options),
- new ParseOperationTest().expected());
- }
-
- public void testDeleteInstanceResponseIs2xx() {
- HttpRequest delete = HttpRequest
- .builder()
- .method("DELETE")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse deleteResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/zone_operation.json")).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, delete, deleteResponse).getInstanceApiForProject("myproject");
-
- assertEquals(api.deleteInZone("us-central1-a", "test-1"),
- new ParseOperationTest().expected());
- }
-
- public void testDeleteInstanceResponseIs4xx() {
- HttpRequest delete = HttpRequest
- .builder()
- .method("DELETE")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse deleteResponse = HttpResponse.builder().statusCode(404).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, delete, deleteResponse).getInstanceApiForProject("myproject");
-
- assertNull(api.deleteInZone("us-central1-a", "test-1"));
- }
-
- public void testListInstancesResponseIs2xx() {
-
- InstanceApi api = requestsSendResponses(
- requestForScopes(COMPUTE_READONLY_SCOPE), TOKEN_RESPONSE,
- LIST_INSTANCES_REQUEST, LIST_INSTANCES_RESPONSE).getInstanceApiForProject("myproject");
-
- assertEquals(api.listFirstPageInZone("us-central1-a").toString(),
- new ParseInstanceListTest().expected().toString());
- }
-
- public void testListInstancesResponseIs4xx() {
- HttpRequest list = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, list, operationResponse).getInstanceApiForProject("myproject");
-
- assertTrue(api.listInZone("us-central1-a").concat().isEmpty());
- }
-
- public void testSetInstanceMetadataResponseIs2xx() {
- HttpRequest setMetadata = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/setMetadata")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/instance_set_metadata.json", MediaType.APPLICATION_JSON))
- .build();
-
- HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/zone_operation.json")).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, setMetadata, setMetadataResponse).getInstanceApiForProject("myproject");
-
- assertEquals(api.setMetadataInZone("us-central1-a", "test-1", ImmutableMap.of("foo", "bar"), "efgh"),
- new ParseOperationTest().expected());
- }
-
- public void testSetInstanceMetadataResponseIs4xx() {
- HttpRequest setMetadata = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/setMetadata")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/instance_set_metadata.json", MediaType.APPLICATION_JSON))
- .build();
-
- HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, setMetadata, setMetadataResponse).getInstanceApiForProject("myproject");
-
- assertNull(api.setMetadataInZone("us-central1-a", "test-1", ImmutableMap.of("foo", "bar"), "efgh"));
- }
-
- public void testResetInstanceResponseIs2xx() {
- HttpRequest reset = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/reset")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse resetResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/zone_operation.json")).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, reset, resetResponse).getInstanceApiForProject("myproject");
-
- assertEquals(api.resetInZone("us-central1-a", "test-1"),
- new ParseOperationTest().expected());
- }
-
- public void testResetInstanceResponseIs4xx() {
- HttpRequest reset = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/reset")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse resetResponse = HttpResponse.builder().statusCode(404).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, reset, resetResponse).getInstanceApiForProject("myproject");
-
- assertNull(api.resetInZone("us-central1-a", "test-1"));
- }
-
- public void testAttachDiskResponseIs2xx() {
- HttpRequest attach = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/attachDisk")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/instance_attach_disk.json", MediaType.APPLICATION_JSON))
- .build();
-
- HttpResponse attachResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/zone_operation.json")).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, attach, attachResponse).getInstanceApiForProject("myproject");
-
- assertEquals(api.attachDiskInZone("us-central1-a", "test-1",
- new AttachDiskOptions()
- .mode(DiskMode.READ_ONLY)
- .source(URI.create("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1"))
- .type(DiskType.PERSISTENT)),
- new ParseOperationTest().expected());
- }
-
- public void testAttachDiskResponseIs4xx() {
- HttpRequest attach = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/attachDisk")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/instance_attach_disk.json", MediaType.APPLICATION_JSON))
- .build();
-
- HttpResponse attachResponse = HttpResponse.builder().statusCode(404).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, attach, attachResponse).getInstanceApiForProject("myproject");
-
- assertNull(api.attachDiskInZone("us-central1-a", "test-1",
- new AttachDiskOptions()
- .mode(DiskMode.READ_ONLY)
- .source(URI.create("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1"))
- .type(DiskType.PERSISTENT)));
-
- }
-
- public void testDetachDiskResponseIs2xx() {
- HttpRequest detach = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/detachDisk" +
- "?deviceName=test-disk-1")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .build();
-
- HttpResponse detachResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/zone_operation.json")).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, detach, detachResponse).getInstanceApiForProject("myproject");
-
- assertEquals(api.detachDiskInZone("us-central1-a", "test-1", "test-disk-1"),
- new ParseOperationTest().expected());
- }
-
- public void testDetachDiskResponseIs4xx() {
- HttpRequest detach = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/detachDisk" +
- "?deviceName=test-disk-1")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .build();
-
- HttpResponse detachResponse = HttpResponse.builder().statusCode(404).build();
-
- InstanceApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, detach, detachResponse).getInstanceApiForProject("myproject");
-
- assertNull(api.detachDiskInZone("us-central1-a", "test-1", "test-disk-1"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
deleted file mode 100644
index a781602..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.List;
-import java.util.Properties;
-
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
-import org.jclouds.googlecomputeengine.domain.Image;
-import org.jclouds.googlecomputeengine.domain.Instance;
-import org.jclouds.googlecomputeengine.domain.Instance.AttachedDisk;
-import org.jclouds.googlecomputeengine.domain.Instance.PersistentAttachedDisk;
-import org.jclouds.googlecomputeengine.domain.InstanceTemplate;
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiLiveTest;
-import org.jclouds.googlecomputeengine.options.AttachDiskOptions;
-import org.jclouds.googlecomputeengine.options.AttachDiskOptions.DiskMode;
-import org.jclouds.googlecomputeengine.options.AttachDiskOptions.DiskType;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.inject.Module;
-
-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-live-test-instance";
- private static final String BOOT_DISK_NAME = INSTANCE_NAME + "-boot-disk";
- 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";
- private static final String METADATA_ITEM_VALUE = "instanceLiveTestTestValue";
- private static final String ATTACH_DISK_NAME = "instance-api-live-test-attach-disk";
- private static final String ATTACH_DISK_DEVICE_NAME = "attach-disk-1";
-
- private static final int TIME_WAIT = 600;
-
- private InstanceTemplate instance;
-
- @Override
- protected GoogleComputeEngineApi create(Properties props, Iterable<Module> modules) {
- GoogleComputeEngineApi api = super.create(props, modules);
- URI imageUri = api.getImageApiForProject("centos-cloud")
- .list(new ListOptions.Builder().filter("name eq centos.*"))
- .concat()
- .filter(new Predicate<Image>() {
- @Override
- public boolean apply(Image input) {
- // filter out all deprecated images
- return !(input.getDeprecated().isPresent() && input.getDeprecated().get().getState().isPresent());
- }
- })
- .first()
- .get()
- .getSelfLink();
- instance = InstanceTemplate.builder()
- .forMachineType(getDefaultMachineTypeUrl(userProject.get()))
- .addNetworkInterface(getNetworkUrl(userProject.get(), INSTANCE_NETWORK_NAME),
- Instance.NetworkInterface.AccessConfig.Type.ONE_TO_ONE_NAT)
- .addMetadata("mykey", "myvalue")
- .description("a description")
- .addDisk(InstanceTemplate.PersistentDisk.Mode.READ_WRITE, getDiskUrl(userProject.get(), BOOT_DISK_NAME),
- null, true, true)
- .addDisk(InstanceTemplate.PersistentDisk.Mode.READ_WRITE, getDiskUrl(userProject.get(), DISK_NAME))
- .image(imageUri);
-
- return api;
- }
-
- private InstanceApi api() {
- return api.getInstanceApiForProject(userProject.get());
- }
-
- private DiskApi diskApi() {
- return api.getDiskApiForProject(userProject.get());
- }
-
- @Test(groups = "live")
- public void testInsertInstance() {
-
- // need to create the network first
- assertGlobalOperationDoneSucessfully(api.getNetworkApiForProject(userProject.get()).createInIPv4Range
- (INSTANCE_NETWORK_NAME, IPV4_RANGE), TIME_WAIT);
-
-
- assertZoneOperationDoneSucessfully(api.getDiskApiForProject(userProject.get())
- .createFromImageInZone(instance.getImage().toString(),
- BOOT_DISK_NAME,
- DEFAULT_ZONE_NAME),
- TIME_WAIT);
-
-
- assertZoneOperationDoneSucessfully(diskApi().createInZone
- ("instance-live-test-disk", 10, DEFAULT_ZONE_NAME), TIME_WAIT);
-
- assertZoneOperationDoneSucessfully(api().createInZone(INSTANCE_NAME, DEFAULT_ZONE_NAME, instance), TIME_WAIT);
-
- }
-
- @Test(groups = "live", dependsOnMethods = "testInsertInstance")
- public void testGetInstance() {
-
- Instance instance = api().getInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME);
- assertNotNull(instance);
- assertInstanceEquals(instance, this.instance);
- }
-
- @Test(groups = "live", dependsOnMethods = "testListInstance")
- public void testSetMetadataForInstance() {
- Instance originalInstance = api().getInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME);
- assertZoneOperationDoneSucessfully(api().setMetadataInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME,
- ImmutableMap.of(METADATA_ITEM_KEY, METADATA_ITEM_VALUE),
- originalInstance.getMetadata().getFingerprint()),
- TIME_WAIT);
-
- Instance modifiedInstance = api().getInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME);
-
- assertTrue(modifiedInstance.getMetadata().getItems().containsKey(METADATA_ITEM_KEY));
- assertEquals(modifiedInstance.getMetadata().getItems().get(METADATA_ITEM_KEY),
- METADATA_ITEM_VALUE);
- assertNotNull(modifiedInstance.getMetadata().getFingerprint());
-
- }
-
- @Test(groups = "live", dependsOnMethods = "testSetMetadataForInstance")
- public void testAttachDiskToInstance() {
- assertZoneOperationDoneSucessfully(diskApi().createInZone(ATTACH_DISK_NAME, 1, DEFAULT_ZONE_NAME), TIME_WAIT);
-
- Instance originalInstance = api().getInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME);
- assertZoneOperationDoneSucessfully(api().attachDiskInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME,
- new AttachDiskOptions().type(DiskType.PERSISTENT)
- .source(getDiskUrl(userProject.get(), ATTACH_DISK_NAME))
- .mode(DiskMode.READ_ONLY)
- .deviceName(ATTACH_DISK_DEVICE_NAME)),
- TIME_WAIT);
-
- Instance modifiedInstance = api().getInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME);
-
- assertTrue(modifiedInstance.getDisks().size() > originalInstance.getDisks().size());
- assertTrue(Iterables.any(modifiedInstance.getDisks(), new Predicate<AttachedDisk>() {
-
- @Override
- public boolean apply(AttachedDisk disk) {
- return disk instanceof PersistentAttachedDisk &&
- ((PersistentAttachedDisk) disk).getDeviceName().isPresent() &&
- ((PersistentAttachedDisk) disk).getDeviceName().get().equals(ATTACH_DISK_DEVICE_NAME);
- }
- }));
- }
-
- @Test(groups = "live", dependsOnMethods = "testAttachDiskToInstance")
- public void testDetachDiskFromInstance() {
- Instance originalInstance = api().getInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME);
- assertZoneOperationDoneSucessfully(api().detachDiskInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME,
- ATTACH_DISK_DEVICE_NAME), TIME_WAIT);
-
- Instance modifiedInstance = api().getInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME);
-
- assertTrue(modifiedInstance.getDisks().size() < originalInstance.getDisks().size());
-
- assertZoneOperationDoneSucessfully(diskApi().deleteInZone(DEFAULT_ZONE_NAME, ATTACH_DISK_NAME), TIME_WAIT);
- }
-
- @Test(groups = "live", dependsOnMethods = "testInsertInstance")
- public void testListInstance() {
-
- PagedIterable<Instance> instances = api().listInZone(DEFAULT_ZONE_NAME, new ListOptions.Builder()
- .filter("name eq " + INSTANCE_NAME));
-
- List<Instance> instancesAsList = Lists.newArrayList(instances.concat());
-
- assertEquals(instancesAsList.size(), 1);
-
- assertInstanceEquals(Iterables.getOnlyElement(instancesAsList), instance);
-
- }
-
- @Test(groups = "live", dependsOnMethods = "testDetachDiskFromInstance")
- public void testResetInstance() {
- assertZoneOperationDoneSucessfully(api().resetInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME),
- TIME_WAIT);
- }
-
- @Test(groups = "live", dependsOnMethods = "testResetInstance")
- public void testDeleteInstance() {
-
- assertZoneOperationDoneSucessfully(api().deleteInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME), TIME_WAIT);
- assertZoneOperationDoneSucessfully(api.getDiskApiForProject(userProject.get()).deleteInZone(DEFAULT_ZONE_NAME, DISK_NAME),
- TIME_WAIT);
- assertZoneOperationDoneSucessfully(api.getDiskApiForProject(userProject.get()).deleteInZone(DEFAULT_ZONE_NAME, BOOT_DISK_NAME),
- TIME_WAIT);
- assertGlobalOperationDoneSucessfully(api.getNetworkApiForProject(userProject.get()).delete
- (INSTANCE_NETWORK_NAME), TIME_WAIT);
- }
-
- private void assertInstanceEquals(Instance result, InstanceTemplate expected) {
- assertEquals(result.getName(), expected.getName());
- assertEquals(result.getMetadata().getItems(), expected.getMetadata());
- }
-
- @AfterClass(groups = { "integration", "live" })
- protected void tearDownContext() {
- try {
- waitZoneOperationDone(api().deleteInZone(DEFAULT_ZONE_NAME, INSTANCE_NAME), TIME_WAIT);
- waitZoneOperationDone(api.getDiskApiForProject(userProject.get()).deleteInZone(DEFAULT_ZONE_NAME, DISK_NAME),
- TIME_WAIT);
- waitZoneOperationDone(api.getDiskApiForProject(userProject.get()).deleteInZone(DEFAULT_ZONE_NAME, BOOT_DISK_NAME),
- TIME_WAIT);
- waitGlobalOperationDone(api.getNetworkApiForProject(userProject.get()).delete
- (INSTANCE_NETWORK_NAME), TIME_WAIT);
- } catch (Exception e) {
- // we don't really care about any exception here, so just delete away.
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java
deleted file mode 100644
index 35dec08..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;
-import org.jclouds.googlecomputeengine.parse.ParseMachineTypeListTest;
-import org.jclouds.googlecomputeengine.parse.ParseMachineTypeTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class MachineTypeApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
-
- public static final HttpRequest LIST_MACHINE_TYPES_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse LIST_MACHINE_TYPES_RESPONSE = HttpResponse.builder()
- .statusCode(200)
- .payload(staticPayloadFromResource("/machinetype_list.json"))
- .build();
-
- public static final HttpRequest LIST_CENTRAL1B_MACHINE_TYPES_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b/machineTypes")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse LIST_CENTRAL1B_MACHINE_TYPES_RESPONSE = HttpResponse.builder()
- .statusCode(200)
- .payload(staticPayloadFromResource("/machinetype_list_central1b.json"))
- .build();
-
- public void testGetMachineTypeResponseIs2xx() throws Exception {
- HttpRequest get = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/machinetype.json")).build();
-
- MachineTypeApi machineTypeApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, get, operationResponse).getMachineTypeApiForProject("myproject");
-
- assertEquals(machineTypeApi.getInZone("us-central1-a", "n1-standard-1"),
- new ParseMachineTypeTest().expected());
- }
-
- public void testGetMachineTypeResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- MachineTypeApi machineTypeApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, get, operationResponse).getMachineTypeApiForProject("myproject");
-
- assertNull(machineTypeApi.getInZone("us-central1-a", "n1-standard-1"));
- }
-
- public void testListMachineTypeNoOptionsResponseIs2xx() throws Exception {
-
- MachineTypeApi machineTypeApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, LIST_MACHINE_TYPES_REQUEST, LIST_MACHINE_TYPES_RESPONSE).getMachineTypeApiForProject
- ("myproject");
-
- assertEquals(machineTypeApi.listFirstPageInZone("us-central1-a").toString(),
- new ParseMachineTypeListTest().expected().toString());
- }
-
- public void testLisOperationWithPaginationOptionsResponseIs4xx() {
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- MachineTypeApi machineTypeApi = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, LIST_MACHINE_TYPES_REQUEST, operationResponse).getMachineTypeApiForProject("myproject");
-
- assertTrue(machineTypeApi.listInZone("us-central1-a").concat().isEmpty());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiLiveTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiLiveTest.java
deleted file mode 100644
index d9d00a1..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiLiveTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.jclouds.collect.IterableWithMarker;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.MachineType;
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiLiveTest;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-public class MachineTypeApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
-
- private MachineType machineType;
-
- private MachineTypeApi api() {
- return api.getMachineTypeApiForProject(userProject.get());
- }
-
- @Test(groups = "live")
- public void testListMachineType() {
-
- PagedIterable<MachineType> machineTypes = api().listInZone(DEFAULT_ZONE_NAME, new ListOptions.Builder()
- .maxResults(1));
-
- Iterator<IterableWithMarker<MachineType>> pageIterator = machineTypes.iterator();
- assertTrue(pageIterator.hasNext());
-
- IterableWithMarker<MachineType> singlePageIterator = pageIterator.next();
- List<MachineType> machineTypeAsList = Lists.newArrayList(singlePageIterator);
-
- assertSame(machineTypeAsList.size(), 1);
-
- this.machineType = Iterables.getOnlyElement(machineTypeAsList);
- }
-
-
- @Test(groups = "live", dependsOnMethods = "testListMachineType")
- public void testGetMachineType() {
- MachineType machineType = api().getInZone(DEFAULT_ZONE_NAME, this.machineType.getName());
- assertNotNull(machineType);
- assertMachineTypeEquals(machineType, this.machineType);
- }
-
- private void assertMachineTypeEquals(MachineType result, MachineType expected) {
- assertEquals(result.getName(), expected.getName());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiExpectTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiExpectTest.java
deleted file mode 100644
index 1b2d73b..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiExpectTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.AssertJUnit.assertNull;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;
-import org.jclouds.googlecomputeengine.parse.ParseNetworkListTest;
-import org.jclouds.googlecomputeengine.parse.ParseNetworkTest;
-import org.jclouds.googlecomputeengine.parse.ParseOperationTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class NetworkApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
-
- public static final HttpRequest GET_NETWORK_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis.com/compute/v1/projects/myproject/global/networks/jclouds-test")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse GET_NETWORK_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/network_get.json")).build();
-
- public void testGetNetworkResponseIs2xx() throws Exception {
-
- NetworkApi api = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, GET_NETWORK_REQUEST, GET_NETWORK_RESPONSE).getNetworkApiForProject("myproject");
-
- assertEquals(api.get("jclouds-test"),
- new ParseNetworkTest().expected());
- }
-
- public void testGetNetworkResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis.com/compute/v1/projects/myproject/global/networks/jclouds-test")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- NetworkApi api = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, get, operationResponse).getNetworkApiForProject("myproject");
-
- assertNull(api.get("jclouds-test"));
- }
-
- public void testInsertNetworkResponseIs2xx() {
- HttpRequest insert = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://www.googleapis.com/compute/v1/projects/myproject/global/networks")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/network_insert.json", MediaType.APPLICATION_JSON))
- .build();
-
- HttpResponse insertNetworkResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/operation.json")).build();
-
- NetworkApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, insert,
- insertNetworkResponse).getNetworkApiForProject("myproject");
-
- assertEquals(api.createInIPv4Range("test-network", "10.0.0.0/8"), new ParseOperationTest().expected());
- }
-
- public void testDeleteNetworkResponseIs2xx() {
- HttpRequest delete = HttpRequest
- .builder()
- .method("DELETE")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/networks/jclouds-test")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse deleteResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/operation.json")).build();
-
- NetworkApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, delete, deleteResponse).getNetworkApiForProject("myproject");
-
- assertEquals(api.delete("jclouds-test"),
- new ParseOperationTest().expected());
- }
-
- public void testDeleteNetworkResponseIs4xx() {
- HttpRequest delete = HttpRequest
- .builder()
- .method("DELETE")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/networks/jclouds-test")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse deleteResponse = HttpResponse.builder().statusCode(404).build();
-
- NetworkApi api = requestsSendResponses(requestForScopes(COMPUTE_SCOPE),
- TOKEN_RESPONSE, delete, deleteResponse).getNetworkApiForProject("myproject");
-
- assertNull(api.delete("jclouds-test"));
- }
-
- public void testListNetworksResponseIs2xx() {
- HttpRequest list = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/networks")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/network_list.json")).build();
-
- NetworkApi api = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, list, operationResponse).getNetworkApiForProject("myproject");
-
- assertEquals(api.listFirstPage().toString(),
- new ParseNetworkListTest().expected().toString());
- }
-
- public void testListNetworksResponseIs4xx() {
- HttpRequest list = HttpRequest
- .builder()
- .method("GET")
- .endpoint("https://www.googleapis" +
- ".com/compute/v1/projects/myproject/global/networks")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse operationResponse = HttpResponse.builder().statusCode(404).build();
-
- NetworkApi api = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, list, operationResponse).getNetworkApiForProject("myproject");
-
- assertTrue(api.list().concat().isEmpty());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java
deleted file mode 100644
index 5b6aa61..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.List;
-
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.Network;
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiLiveTest;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-public class NetworkApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
-
- private static final String NETWORK_NAME = "network-api-live-test-network";
- private static final String IPV4_RANGE = "10.0.0.0/8";
- private static final int TIME_WAIT = 10;
-
- private NetworkApi api() {
- return api.getNetworkApiForProject(userProject.get());
- }
-
- @Test(groups = "live")
- public void testInsertNetwork() {
-
- assertGlobalOperationDoneSucessfully(api().createInIPv4Range(NETWORK_NAME, IPV4_RANGE), TIME_WAIT);
-
- }
-
- @Test(groups = "live", dependsOnMethods = "testInsertNetwork")
- public void testGetNetwork() {
-
- Network network = api().get(NETWORK_NAME);
- assertNotNull(network);
- assertNetworkEquals(network);
- }
-
- @Test(groups = "live", dependsOnMethods = "testGetNetwork")
- public void testListNetwork() {
-
- PagedIterable<Network> networks = api().list(new ListOptions.Builder()
- .filter("name eq " + NETWORK_NAME));
-
- List<Network> networksAsList = Lists.newArrayList(networks.concat());
-
- assertEquals(networksAsList.size(), 1);
-
- assertNetworkEquals(Iterables.getOnlyElement(networksAsList));
-
- }
-
- @Test(groups = "live", dependsOnMethods = "testListNetwork")
- public void testDeleteNetwork() {
-
- assertGlobalOperationDoneSucessfully(api().delete(NETWORK_NAME), TIME_WAIT);
- }
-
- private void assertNetworkEquals(Network result) {
- assertEquals(result.getName(), NETWORK_NAME);
- assertEquals(result.getIPv4Range(), IPV4_RANGE);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiExpectTest.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiExpectTest.java
deleted file mode 100644
index 45e9f6c..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiExpectTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.googlecomputeengine.GoogleComputeEngineConstants;
-import org.jclouds.googlecomputeengine.domain.Metadata;
-import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;
-import org.jclouds.googlecomputeengine.parse.ParseMetadataTest;
-import org.jclouds.googlecomputeengine.parse.ParseOperationTest;
-import org.jclouds.googlecomputeengine.parse.ParseProjectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-
-@Test(groups = "unit")
-public class ProjectApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
-
- public static final String PROJECTS_URL_PREFIX = "https://www.googleapis.com/compute/v1/projects";
-
- public static final HttpRequest GET_PROJECT_REQUEST = HttpRequest
- .builder()
- .method("GET")
- .endpoint(PROJECTS_URL_PREFIX + "/myproject")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- public static final HttpResponse GET_PROJECT_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/project.json")).build();
-
- public void testGetProjectResponseIs2xx() throws Exception {
- ProjectApi api = requestsSendResponses(requestForScopes(GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, GET_PROJECT_REQUEST,
- GET_PROJECT_RESPONSE).getProjectApi();
-
- assertEquals(api.get("myproject"), new ParseProjectTest().expected());
- }
-
- public void testGetProjectResponseIs4xx() throws Exception {
- HttpRequest getProjectRequest = HttpRequest
- .builder()
- .method("GET")
- .endpoint(PROJECTS_URL_PREFIX + "/myproject")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN).build();
-
- HttpResponse getProjectResponse = HttpResponse.builder().statusCode(404).build();
-
- ProjectApi api = requestsSendResponses(requestForScopes(GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE),
- TOKEN_RESPONSE, getProjectRequest,
- getProjectResponse).getProjectApi();
-
- assertNull(api.get("myproject"));
- }
-
- public void testSetCommonInstanceMetadata() {
- HttpRequest setMetadata = HttpRequest
- .builder()
- .method("POST")
- .endpoint(PROJECTS_URL_PREFIX + "/myproject/setCommonInstanceMetadata")
- .addHeader("Accept", "application/json")
- .addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/metadata.json", MediaType.APPLICATION_JSON))
- .build();
-
- HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/global_operation.json")).build();
-
- ProjectApi api = requestsSendResponses(requestForScopes(GoogleComputeEngineConstants.COMPUTE_SCOPE),
- TOKEN_RESPONSE, setMetadata,
- setMetadataResponse).getProjectApi();
- Metadata expected = new ParseMetadataTest().expected();
- assertEquals(api.setCommonInstanceMetadata("myproject", expected.getItems(), expected.getFingerprint()),
- new ParseOperationTest().expected());
- }
-
-}