You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ev...@apache.org on 2014/11/18 21:21:11 UTC
[2/6] jclouds git commit: JCLOUDS-716: Remove Rackspace First-Gen
Cloud Servers
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerListFromJsonResponseTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerListFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerListFromJsonResponseTest.java
deleted file mode 100644
index 10a41b7..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerListFromJsonResponseTest.java
+++ /dev/null
@@ -1,100 +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.cloudservers.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.UnknownHostException;
-import java.util.List;
-
-import org.jclouds.cloudservers.domain.Addresses;
-import org.jclouds.cloudservers.domain.Server;
-import org.jclouds.cloudservers.domain.ServerStatus;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-
-/**
- * Tests behavior of {@code ParseServerListFromJsonResponse}
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit")
-public class ParseServerListFromJsonResponseTest {
-
- Injector i = Guice.createInjector(new GsonModule());
-
- public void testApplyInputStream() {
- InputStream is = getClass().getResourceAsStream("/test_list_servers.json");
-
- List<Server> expects = ImmutableList.of(Server.builder().id(1234).name("sample-server").build(),
- Server.builder().id(5678).name("sample-server2").build());
-
- UnwrapOnlyJsonValue<List<Server>> parser = i.getInstance(Key
- .get(new TypeLiteral<UnwrapOnlyJsonValue<List<Server>>>() {
- }));
- List<Server> response = parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build());
-
- assertEquals(response, expects);
- }
-
- public void testApplyInputStreamDetails() throws UnknownHostException {
- InputStream is = getClass().getResourceAsStream("/test_list_servers_detail.json");
-
- UnwrapOnlyJsonValue<List<Server>> parser = i.getInstance(Key
- .get(new TypeLiteral<UnwrapOnlyJsonValue<List<Server>>>() {
- }));
- List<Server> response = parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build());
-
- assertEquals(response.get(0).getId(), 1234);
- assertEquals(response.get(0).getName(), "sample-server");
- assertEquals(response.get(0).getImageId(), Integer.valueOf(2));
- assertEquals(response.get(0).getFlavorId(), Integer.valueOf(1));
- assertEquals(response.get(0).getHostId(), "e4d909c290d0fb1ca068ffaddf22cbd0");
- assertEquals(response.get(0).getStatus(), ServerStatus.BUILD);
- assertEquals(response.get(0).getProgress(), Integer.valueOf(60));
- List<String> publicAddresses = Lists.newArrayList("67.23.10.132", "67.23.10.131");
- List<String> privateAddresses = Lists.newArrayList("10.176.42.16");
- Addresses addresses1 = Addresses.builder().privateAddresses(privateAddresses).publicAddresses(publicAddresses).build();
- assertEquals(response.get(0).getAddresses(), addresses1);
- assertEquals(response.get(0).getMetadata(), ImmutableMap.of("Server Label", "Web Head 1", "Image Version", "2.1"));
- assertEquals(response.get(1).getId(), 5678);
- assertEquals(response.get(1).getName(), "sample-server2");
- assertEquals(response.get(1).getImageId(), Integer.valueOf(2));
- assertEquals(response.get(1).getFlavorId(), Integer.valueOf(1));
- assertEquals(response.get(1).getHostId(), "9e107d9d372bb6826bd81d3542a419d6");
- assertEquals(response.get(1).getStatus(), ServerStatus.ACTIVE);
- assertEquals(response.get(1).getProgress(), null);
- List<String> publicAddresses2 = Lists.newArrayList("67.23.10.133");
- List<String> privateAddresses2 = Lists.newArrayList("10.176.42.17");
- Addresses addresses2 = Addresses.builder().privateAddresses(privateAddresses2).publicAddresses(publicAddresses2).build();
- assertEquals(response.get(1).getAddresses(), addresses2);
- assertEquals(response.get(1).getMetadata(), ImmutableMap.of("Server Label", "DB 1"));
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java
deleted file mode 100644
index 337b6d6..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java
+++ /dev/null
@@ -1,58 +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.cloudservers.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.UnknownHostException;
-
-import org.jclouds.cloudservers.domain.SharedIpGroup;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-
-/**
- * Tests behavior of {@code ParseSharedIpGroupFromJsonResponse}
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit")
-public class ParseSharedIpGroupFromJsonResponseTest {
-
- Injector i = Guice.createInjector(new GsonModule());
-
- public void testApplyInputStreamDetails() throws UnknownHostException {
- InputStream is = getClass().getResourceAsStream("/test_get_sharedipgroup_details.json");
-
- UnwrapOnlyJsonValue<SharedIpGroup> parser = i.getInstance(Key
- .get(new TypeLiteral<UnwrapOnlyJsonValue<SharedIpGroup>>() {
- }));
- SharedIpGroup response = parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build());
-
- assertEquals(response.getId(), 1234);
- assertEquals(response.getName(), "Shared IP Group 1");
- assertEquals(response.getServers(), ImmutableList.of(422));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java
deleted file mode 100644
index ba6390d..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java
+++ /dev/null
@@ -1,80 +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.cloudservers.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.UnknownHostException;
-import java.util.List;
-
-import org.jclouds.cloudservers.domain.SharedIpGroup;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-
-/**
- * Tests behavior of {@code ParseSharedIpGroupListFromJsonResponse}
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit")
-public class ParseSharedIpGroupListFromJsonResponseTest {
-
- Injector i = Guice.createInjector(new GsonModule());
-
- public void testApplyInputStream() {
- InputStream is = getClass().getResourceAsStream("/test_list_sharedipgroups.json");
-
- List<SharedIpGroup> expects = ImmutableList.of(SharedIpGroup.builder().id(1234).name("Shared IP Group 1").build(),
- SharedIpGroup.builder().id(5678).name("Shared IP Group 2").build());
-
- UnwrapOnlyJsonValue<List<SharedIpGroup>> parser = i.getInstance(Key
- .get(new TypeLiteral<UnwrapOnlyJsonValue<List<SharedIpGroup>>>() {
- }));
- List<SharedIpGroup> response = parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build());
-
- assertEquals(response, expects);
-
- }
-
- public void testApplyInputStreamDetails() throws UnknownHostException {
- InputStream is = getClass().getResourceAsStream("/test_list_sharedipgroups_detail.json");
-
- UnwrapOnlyJsonValue<List<SharedIpGroup>> parser = i.getInstance(Key
- .get(new TypeLiteral<UnwrapOnlyJsonValue<List<SharedIpGroup>>>() {
- }));
- List<SharedIpGroup> response = parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build());
-
- assertEquals(response.get(0).getId(), 1234);
- assertEquals(response.get(0).getName(), "Shared IP Group 1");
- assertEquals(response.get(0).getServers(), ImmutableList.of(422, 3445));
-
- assertEquals(response.get(1).getId(), 5678);
- assertEquals(response.get(1).getName(), "Shared IP Group 2");
- assertEquals(response.get(1).getServers(), ImmutableList.of(23203, 2456, 9891));
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/handlers/RetryOnRenewExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/handlers/RetryOnRenewExpectTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/handlers/RetryOnRenewExpectTest.java
deleted file mode 100644
index 8cc03a0..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/handlers/RetryOnRenewExpectTest.java
+++ /dev/null
@@ -1,130 +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.cloudservers.handlers;
-
-import org.jclouds.cloudservers.CloudServersClient;
-import org.jclouds.cloudservers.internal.BaseCloudServersRestClientExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.io.Payloads;
-import org.jclouds.rest.AuthorizationException;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code RetryOnRenew} handler
- *
- * @author grkvlt@apache.org
- */
-@Test(groups = "unit", testName = "RetryOnRenewExpectTest")
-public class RetryOnRenewExpectTest extends BaseCloudServersRestClientExpectTest {
-
- @Test
- public void testShouldReauthenticateOn401() {
-
- HttpRequest deleteImage = HttpRequest.builder().method("DELETE")
- .endpoint("https://lon.servers.api.rackspacecloud.com/v1.0/10001786/images/11?now=1257695648897")
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse pleaseRenew = HttpResponse
- .builder()
- .statusCode(401)
- .message("HTTP/1.1 401 Unauthorized")
- .payload("[{\"unauthorized\":{\"message\":\"Invalid authentication token. Please renew.\",\"code\":401}}]")
- .build();
-
- // second auth uses same creds as initial one
- HttpRequest redoAuth = initialAuth;
-
- String authToken2 = "12345678-9012-47c0-9770-2c5097da25fc";
-
- HttpResponse responseWithUrls2 = responseWithAuth.toBuilder()
- .payload(responseWithAuth.getPayload().getRawContent().toString().replace(authToken, authToken2))
- .build();
-
- HttpRequest deleteImage2 = HttpRequest.builder().method("DELETE")
- .endpoint("https://lon.servers.api.rackspacecloud.com/v1.0/10001786/images/11?now=1257695648897")
- .addHeader("X-Auth-Token", authToken2).build();
-
- HttpResponse imageDeleted = HttpResponse.builder().statusCode(204).message("HTTP/1.1 204 No Content").build();
-
- CloudServersClient clientWhenImageExists = orderedRequestsSendResponses(initialAuth, responseWithAuth,
- deleteImage, pleaseRenew, redoAuth, responseWithUrls2, deleteImage2, imageDeleted);
-
- assert clientWhenImageExists.deleteImage(11);
- }
-
- public void testReauthenticateOn401ForFailedCommand() {
- String requestUrl = "https://lon.servers.api.rackspacecloud.com/v1.0/10001786/images/11?now=1257695648897";
- HttpRequest deleteImage = HttpRequest.builder().method("DELETE")
- .endpoint(requestUrl)
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse unauthResponse = HttpResponse
- .builder()
- .statusCode(401)
- .message("HTTP/1.1 401 Unauthorized")
- .payload("[{\"unauthorized\":{\"message\":\"Fatal unauthorized.\",\"code\":401}}]")
- .build();
-
- // second auth uses same creds as initial one
- HttpRequest redoAuth = initialAuth;
-
- String authToken2 = "12345678-9012-47c0-9770-2c5097da25fc";
- HttpResponse responseWithUrls2 = responseWithAuth.toBuilder()
- .payload(responseWithAuth.getPayload().getRawContent().toString()
- .replace(authToken, authToken2)).build();
-
- HttpRequest deleteImage2 = HttpRequest
- .builder().method("DELETE")
- .endpoint(requestUrl).addHeader("X-Auth-Token", authToken2).build();
-
- HttpResponse imageDeleted = HttpResponse.builder().statusCode(204)
- .message("HTTP/1.1 204 No Content").build();
-
- // The sequence of events simulated here is as follows:
- // 1. First auth succeeds.
- // 2. The token returned in #1 is used in the deleteImage command.
- // 3. The deleteImage command fails with a 401 error.
- // 4. This should result in a new auth request which succeeds.
- // 5. The new token is used in the next deleteImage command.
- // 6. Succeed that command.
- CloudServersClient client = orderedRequestsSendResponses(initialAuth,
- responseWithAuth, deleteImage, unauthResponse, redoAuth,
- responseWithUrls2, deleteImage2, imageDeleted);
-
- client.deleteImage(11);
- }
-
- // FIXME stack trace shows the AuthorizationException, but it's buried inside
- // a guice TestException
- @Test(expectedExceptions = AuthorizationException.class)
- public void testDoesNotReauthenticateOnAuthentication401() {
-
- HttpResponse unauthResponse = HttpResponse
- .builder()
- .statusCode(401)
- .message("HTTP/1.1 401 Unauthorized")
- .payload(
- Payloads
- .newStringPayload("[{\"unauthorized\":{\"message\":\"A different message implying fatal.\",\"code\":401}}]"))
- .build();
-
- CloudServersClient client = requestSendsResponse(initialAuth, unauthResponse);
-
- client.deleteImage(11);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersComputeServiceExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersComputeServiceExpectTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersComputeServiceExpectTest.java
deleted file mode 100644
index b5147a3..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersComputeServiceExpectTest.java
+++ /dev/null
@@ -1,101 +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.cloudservers.internal;
-
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
-
-import java.util.Date;
-import java.util.Properties;
-
-import org.jclouds.apis.ApiMetadata;
-import org.jclouds.cloudservers.CloudServersApiMetadata;
-import org.jclouds.cloudservers.config.CloudServersRestClientModule;
-import org.jclouds.compute.ComputeServiceContext;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.openstack.keystone.v1_1.config.AuthenticationServiceModule;
-import org.jclouds.openstack.keystone.v1_1.internal.BaseKeystoneRestClientExpectTest;
-import org.jclouds.rest.ConfiguresRestClient;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-import com.google.inject.Module;
-
-/**
- *
- * @author David Alves
- *
- */
-public abstract class BaseCloudServersComputeServiceExpectTest<T> extends BaseKeystoneRestClientExpectTest<T> implements
- Function<ComputeServiceContext, T> {
-
- public BaseCloudServersComputeServiceExpectTest() {
- provider = "cloudservers";
- }
-
- protected static final String CONSTANT_DATE = "2009-11-08T15:54:08.897Z";
-
- public static class TestAuthenticationServiceModule extends AuthenticationServiceModule {
- @Override
- protected void configure() {
- super.configure();
- }
- }
-
- @Override
- protected Module createModule() {
- return new TestCloudServersRestClientModule();
- }
-
- @ConfiguresRestClient
- protected static class TestCloudServersRestClientModule extends CloudServersRestClientModule {
-
- @Override
- public Supplier<Date> provideCacheBusterDate() {
- return new Supplier<Date>() {
- public Date get() {
- return new SimpleDateFormatDateService().iso8601DateParse(CONSTANT_DATE);
- }
- };
- }
- }
-
- @Override
- protected ApiMetadata createApiMetadata() {
- return new CloudServersApiMetadata();
- }
-
- @Override
- protected Properties setupProperties() {
- Properties overrides = new Properties();
- overrides.setProperty(PROPERTY_REGIONS, "US");
- overrides.setProperty(provider + ".endpoint", endpoint);
- return overrides;
- }
-
- @Override
- public T createClient(Function<HttpRequest, HttpResponse> fn, Module module, Properties props) {
- return apply(createComputeServiceContext(fn, module, props));
- }
-
- private ComputeServiceContext createComputeServiceContext(Function<HttpRequest, HttpResponse> fn, Module module,
- Properties props) {
- return createInjector(fn, module, props).getInstance(ComputeServiceContext.class);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.java
deleted file mode 100644
index 4f7e891..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.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.cloudservers.internal;
-
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
-
-import java.util.Date;
-import java.util.Properties;
-
-import org.jclouds.apis.ApiMetadata;
-import org.jclouds.cloudservers.CloudServersApiMetadata;
-import org.jclouds.cloudservers.CloudServersClient;
-import org.jclouds.cloudservers.config.CloudServersRestClientModule;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.openstack.keystone.v1_1.internal.BaseKeystoneRestClientExpectTest;
-import org.jclouds.rest.ConfiguresRestClient;
-
-import com.google.common.base.Supplier;
-import com.google.inject.Module;
-
-/**
- * Base class for writing CloudServers Rest Client Expect tests
- *
- * @author Adrian Cole
- */
-public class BaseCloudServersRestClientExpectTest extends BaseKeystoneRestClientExpectTest<CloudServersClient> {
-
- public BaseCloudServersRestClientExpectTest() {
- provider = "cloudservers";
- }
-
- @Override
- protected ApiMetadata createApiMetadata() {
- return new CloudServersApiMetadata();
- }
-
-
- @Override
- protected Properties setupProperties() {
- Properties overrides = new Properties();
- overrides.setProperty(PROPERTY_REGIONS, "US");
- overrides.setProperty(provider + ".endpoint", endpoint);
- return overrides;
- }
-
- protected static final String CONSTANT_DATE = "2009-11-08T15:54:08.897Z";
-
- /**
- * override so that we can control the timestamp used in
- * {@link AddTimestampQuery}
- */
- @Override
- protected Module createModule() {
- return new TestCloudServersRestClientModule();
- }
-
- @ConfiguresRestClient
- protected static class TestCloudServersRestClientModule extends CloudServersRestClientModule {
-
- @Override
- public Supplier<Date> provideCacheBusterDate() {
- return new Supplier<Date>() {
- public Date get() {
- return new SimpleDateFormatDateService().iso8601DateParse(CONSTANT_DATE);
- }
- };
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java
deleted file mode 100644
index 1ab9f12..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java
+++ /dev/null
@@ -1,134 +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.cloudservers.options;
-
-import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withFile;
-import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withSharedIp;
-import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withSharedIpGroup;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseFlavorFromJsonResponse}
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit")
-public class CreateServerOptionsTest {
-
- Injector injector = Guice.createInjector(new GsonModule());
-
- @Test
- public void testAddPayloadToRequestMapOfStringStringHttpRequest() {
- CreateServerOptions options = new CreateServerOptions();
- HttpRequest request = buildRequest(options);
- assertEquals("{\"server\":{\"name\":\"foo\",\"imageId\":1,\"flavorId\":2}}", request.getPayload().getRawContent());
- }
-
- private HttpRequest buildRequest(CreateServerOptions options) {
- injector.injectMembers(options);
- HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();
- options.bindToRequest(request, ImmutableMap.<String, Object>of("name", "foo", "imageId", "1", "flavorId", "2"));
- return request;
- }
-
- @Test
- public void testWithFile() {
- CreateServerOptions options = new CreateServerOptions();
- options.withFile("/tmp/rhubarb", "foo".getBytes());
- HttpRequest request = buildRequest(options);
- assertFile(request);
- }
-
- @Test
- public void testWithFileStatic() {
- CreateServerOptions options = withFile("/tmp/rhubarb", "foo".getBytes());
- HttpRequest request = buildRequest(options);
- assertFile(request);
- }
-
- private void assertFile(HttpRequest request) {
- assertEquals(
- "{\"server\":{\"name\":\"foo\",\"imageId\":1,\"flavorId\":2,\"personality\":[{\"path\":\"/tmp/rhubarb\",\"contents\":\"Zm9v\"}]}}",
- request.getPayload().getRawContent());
- }
-
- @Test
- public void testWithSharedIpGroup() {
- CreateServerOptions options = new CreateServerOptions();
- options.withSharedIpGroup(3);
- HttpRequest request = buildRequest(options);
- assertSharedIpGroup(request);
- }
-
- @Test
- public void testWithSharedIpGroupStatic() {
- CreateServerOptions options = withSharedIpGroup(3);
- HttpRequest request = buildRequest(options);
- assertSharedIpGroup(request);
- }
-
- private void assertSharedIpGroup(HttpRequest request) {
- assertEquals("{\"server\":{\"name\":\"foo\",\"imageId\":1,\"flavorId\":2,\"sharedIpGroupId\":3}}", request
- .getPayload().getRawContent());
- }
-
- @Test
- public void testWithMetadata() {
- }
-
- @Test
- public void testWithSharedIp() {
- CreateServerOptions options = new CreateServerOptions();
- options.withSharedIpGroup(3).withSharedIp("127.0.0.1");
- HttpRequest request = buildRequest(options);
- assertSharedIp(request);
- }
-
- @Test
- public void testWithSharedIpStatic() {
- CreateServerOptions options = withSharedIpGroup(3).withSharedIp("127.0.0.1");
- HttpRequest request = buildRequest(options);
- assertSharedIp(request);
- }
-
- private void assertSharedIp(HttpRequest request) {
- assertEquals(
- "{\"server\":{\"name\":\"foo\",\"imageId\":1,\"flavorId\":2,\"sharedIpGroupId\":3,\"addresses\":{\"public\":[\"127.0.0.1\"]}}}",
- request.getPayload().getRawContent());
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testWithSharedIpNoGroup() {
- CreateServerOptions options = new CreateServerOptions();
- options.withSharedIp("127.0.0.1");
- buildRequest(options);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testWithSharedIpNoGroupStatic() {
- CreateServerOptions options = withSharedIp("127.0.0.1");
- buildRequest(options);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java
deleted file mode 100644
index 4151c06..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.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.cloudservers.options;
-
-import static org.jclouds.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseFlavorFromJsonResponse}
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit")
-public class CreateSharedIpGroupOptionsTest {
-
- Injector injector = Guice.createInjector(new GsonModule());
-
- @Test
- public void testAddPayloadToRequestMapOfStringStringHttpRequest() {
- CreateSharedIpGroupOptions options = new CreateSharedIpGroupOptions();
- HttpRequest request = buildRequest(options);
- assertEquals("{\"sharedIpGroup\":{\"name\":\"foo\"}}", request.getPayload().getRawContent());
- }
-
- private HttpRequest buildRequest(CreateSharedIpGroupOptions options) {
- injector.injectMembers(options);
- HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();
- options.bindToRequest(request, ImmutableMap.<String,Object>of("name", "foo"));
- return request;
- }
-
- @Test
- public void testWithServer() {
- CreateSharedIpGroupOptions options = new CreateSharedIpGroupOptions();
- options.withServer(3);
- HttpRequest request = buildRequest(options);
- assertSharedIpGroup(request);
- }
-
- @Test
- public void testWithServerStatic() {
- CreateSharedIpGroupOptions options = withServer(3);
- HttpRequest request = buildRequest(options);
- assertSharedIpGroup(request);
- }
-
- private void assertSharedIpGroup(HttpRequest request) {
- assertEquals("{\"sharedIpGroup\":{\"name\":\"foo\",\"server\":3}}", request.getPayload().getRawContent());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/ListOptionsTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/ListOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/ListOptionsTest.java
deleted file mode 100644
index f690999..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/ListOptionsTest.java
+++ /dev/null
@@ -1,86 +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.cloudservers.options;
-
-import static org.jclouds.cloudservers.options.ListOptions.Builder.changesSince;
-import static org.jclouds.cloudservers.options.ListOptions.Builder.maxResults;
-import static org.jclouds.cloudservers.options.ListOptions.Builder.startAt;
-import static org.jclouds.cloudservers.options.ListOptions.Builder.withDetails;
-import static org.testng.Assert.assertEquals;
-
-import java.util.Date;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListOptions}
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit")
-public class ListOptionsTest {
-
- public void testWithDetails() {
- ListOptions options = new ListOptions().withDetails();
- assertEquals(options.buildPathSuffix(), "/detail");
- }
-
- public void testWithDetailsStatic() {
- ListOptions options = withDetails();
- assertEquals(options.buildPathSuffix(), "/detail");
- }
-
- public void testChangesSince() {
- Date ifModifiedSince = new Date();
- ListOptions options = new ListOptions().changesSince(ifModifiedSince);
- assertEquals(ImmutableList.of(ifModifiedSince.getTime() / 1000 + ""), options
- .buildQueryParameters().get("changes-since"));
- }
-
- public void testStartAt() {
- long offset = 1;
- ListOptions options = new ListOptions().startAt(offset);
- assertEquals(ImmutableList.of("1"), options.buildQueryParameters().get("offset"));
- }
-
- public void testMaxResults() {
- int limit = 1;
- ListOptions options = new ListOptions().maxResults(limit);
- assertEquals(ImmutableList.of("1"), options.buildQueryParameters().get("limit"));
- }
-
- public void testChangesSinceStatic() {
- Date ifModifiedSince = new Date();
- ListOptions options = changesSince(ifModifiedSince);
- assertEquals(ImmutableList.of(ifModifiedSince.getTime() / 1000 + ""), options
- .buildQueryParameters().get("changes-since"));
- }
-
- public void testStartAtStatic() {
- long offset = 1;
- ListOptions options = startAt(offset);
- assertEquals(ImmutableList.of("1"), options.buildQueryParameters().get("offset"));
- }
-
- public void testMaxResultsStatic() {
- int limit = 1;
- ListOptions options = maxResults(limit);
- assertEquals(ImmutableList.of("1"), options.buildQueryParameters().get("limit"));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java
deleted file mode 100644
index d9375b4..0000000
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.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.cloudservers.options;
-
-import static org.jclouds.cloudservers.options.RebuildServerOptions.Builder.withImage;
-import static org.testng.Assert.assertEquals;
-
-import java.util.HashMap;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseFlavorFromJsonResponse}
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit")
-public class RebuildServerOptionsTest {
-
- Injector injector = Guice.createInjector(new GsonModule());
-
- @Test
- public void testAddPayloadToRequestMapOfStringStringHttpRequest() {
- RebuildServerOptions options = new RebuildServerOptions();
- HttpRequest request = buildRequest(options);
- assertEquals("{\"rebuild\":{}}", request.getPayload().getRawContent());
- }
-
- private HttpRequest buildRequest(RebuildServerOptions options) {
- injector.injectMembers(options);
- HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();
- options.bindToRequest(request, new HashMap<String, Object>());
- return request;
- }
-
- @Test
- public void testWithServer() {
- RebuildServerOptions options = new RebuildServerOptions();
- options.withImage(3);
- HttpRequest request = buildRequest(options);
- assertRebuild(request);
- }
-
- @Test
- public void testWithServerStatic() {
- RebuildServerOptions options = withImage(3);
- HttpRequest request = buildRequest(options);
- assertRebuild(request);
- }
-
- private void assertRebuild(HttpRequest request) {
- assertEquals("{\"rebuild\":{\"imageId\":3}}", request.getPayload().getRawContent());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/log4j.xml b/apis/cloudservers/src/test/resources/log4j.xml
deleted file mode 100644
index 7527432..0000000
--- a/apis/cloudservers/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
- <!--
- For more configuration infromation and examples see the Apache
- Log4j website: http://logging.apache.org/log4j/
- -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
- debug="false">
-
- <!-- A time/date based rolling appender -->
- <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-wire.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
- <!-- A time/date based rolling appender -->
- <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-blobstore.log" />
- <param name="Append" value="true" />
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <param name="Threshold" value="TRACE" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-compute.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-ssh.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="COMPUTEFILE" />
- </appender>
-
- <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="SSHFILE" />
- </appender>
-
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="FILE" />
- </appender>
-
- <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="WIREFILE" />
- </appender>
-
- <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="BLOBSTOREFILE" />
- </appender>
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jclouds">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNC" />
- </category>
-
- <category name="jclouds.headers">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCWIRE" />
- </category>
-
- <category name="jclouds.ssh">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCSSH" />
- </category>
- <category name="jclouds.wire">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCWIRE" />
- </category>
- <category name="jclouds.blobstore">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCBLOBSTORE" />
- </category>
- <category name="jclouds.compute">
- <priority value="TRACE" />
- <appender-ref ref="ASYNCCOMPUTE" />
- </category>
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <priority value="WARN" />
- </root>
-
-</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_get_flavor_details.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_get_flavor_details.json b/apis/cloudservers/src/test/resources/test_get_flavor_details.json
deleted file mode 100644
index 28500d2..0000000
--- a/apis/cloudservers/src/test/resources/test_get_flavor_details.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "flavor" : {
- "id" : 1,
- "name" : "256 MB Server",
- "ram" : 256,
- "disk" : 10
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_get_image_active.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_get_image_active.json b/apis/cloudservers/src/test/resources/test_get_image_active.json
deleted file mode 100644
index eb851ef..0000000
--- a/apis/cloudservers/src/test/resources/test_get_image_active.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "image" : {
- "id" : 2,
- "name" : "CentOS 5.2",
- "serverId" : 12,
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2010-08-10T12:00:00Z",
- "status" : "ACTIVE",
- "progress" : 100
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_get_image_details.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_get_image_details.json b/apis/cloudservers/src/test/resources/test_get_image_details.json
deleted file mode 100644
index e73095b..0000000
--- a/apis/cloudservers/src/test/resources/test_get_image_details.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "image" : {
- "id" : 2,
- "name" : "CentOS 5.2",
- "serverId" : 12,
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2010-08-10T12:00:00Z",
- "status" : "SAVING",
- "progress" : 80
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_get_server_detail.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_get_server_detail.json b/apis/cloudservers/src/test/resources/test_get_server_detail.json
deleted file mode 100644
index c90bb0b..0000000
--- a/apis/cloudservers/src/test/resources/test_get_server_detail.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "server" : {
- "id" : 1234,
- "name" : "sample-server",
- "imageId" : 2,
- "flavorId" : 1,
- "hostId" : "e4d909c290d0fb1ca068ffaddf22cbd0",
- "status" : "BUILD",
- "progress" : 60,
- "addresses" : {
- "public" : [
- "67.23.10.132",
- "67.23.10.131"
- ],
- "private" : [
- "10.176.42.16"
- ]
- },
- "metadata" : {
- "Server Label" : "Web Head 1",
- "Image Version" : "2.1"
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_get_sharedipgroup_details.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_get_sharedipgroup_details.json b/apis/cloudservers/src/test/resources/test_get_sharedipgroup_details.json
deleted file mode 100644
index d10f33d..0000000
--- a/apis/cloudservers/src/test/resources/test_get_sharedipgroup_details.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "sharedIpGroup" : {
- "id" : 1234,
- "name" : "Shared IP Group 1",
- "servers" : [422]
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_addresses.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_addresses.json b/apis/cloudservers/src/test/resources/test_list_addresses.json
deleted file mode 100644
index 24441b8..0000000
--- a/apis/cloudservers/src/test/resources/test_list_addresses.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "addresses" : {
- "public" : [
- "67.23.10.132",
- "67.23.10.131"
- ],
- "private" : [
- "10.176.42.16"
- ]
- }
-}
-
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_addresses_private.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_addresses_private.json b/apis/cloudservers/src/test/resources/test_list_addresses_private.json
deleted file mode 100644
index 8c14cf3..0000000
--- a/apis/cloudservers/src/test/resources/test_list_addresses_private.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-
- "private" : [
- "10.176.42.16"
- ]
-
-}
-
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_addresses_public.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_addresses_public.json b/apis/cloudservers/src/test/resources/test_list_addresses_public.json
deleted file mode 100644
index 22982cc..0000000
--- a/apis/cloudservers/src/test/resources/test_list_addresses_public.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "public" : [
- "67.23.10.132",
- "67.23.10.131"
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_backupschedule.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_backupschedule.json b/apis/cloudservers/src/test/resources/test_list_backupschedule.json
deleted file mode 100644
index c2f893a..0000000
--- a/apis/cloudservers/src/test/resources/test_list_backupschedule.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "backupSchedule" : {
- "enabled" : true,
- "weekly" : "THURSDAY",
- "daily" : "H_0400_0600"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_flavors.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_flavors.json b/apis/cloudservers/src/test/resources/test_list_flavors.json
deleted file mode 100644
index d1cc9be..0000000
--- a/apis/cloudservers/src/test/resources/test_list_flavors.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "flavors" : [
- {
- "id" : 1,
- "name" : "256 MB Server"
- },
- {
- "id" : 2,
- "name" : "512 MB Server"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_flavors_detail.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_flavors_detail.json b/apis/cloudservers/src/test/resources/test_list_flavors_detail.json
deleted file mode 100644
index a274908..0000000
--- a/apis/cloudservers/src/test/resources/test_list_flavors_detail.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "flavors" : [
- {
- "id" : 1,
- "name" : "256 MB Server",
- "ram" : 256,
- "disk" : 10
- },
- {
- "id" : 2,
- "name" : "512 MB Server",
- "ram" : 512,
- "disk" : 20
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_images.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_images.json b/apis/cloudservers/src/test/resources/test_list_images.json
deleted file mode 100644
index 0c5cb25..0000000
--- a/apis/cloudservers/src/test/resources/test_list_images.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "id" : 2,
- "name" : "CentOS 5.2"
- },
- {
- "id" : 743,
- "name" : "My Server Backup"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_images_detail.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_images_detail.json b/apis/cloudservers/src/test/resources/test_list_images_detail.json
deleted file mode 100644
index bdafc2d..0000000
--- a/apis/cloudservers/src/test/resources/test_list_images_detail.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "images" : [
- {
- "id" : 2,
- "name" : "CentOS 5.2",
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2010-08-10T12:00:00Z",
- "status" : "ACTIVE"
- },
- {
- "id" : 743,
- "name" : "My Server Backup",
- "serverId" : 12,
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2009-07-07T09:56:16-05:00",
- "status" : "SAVING",
- "progress" : 80
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_images_detail_imageextension.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_images_detail_imageextension.json b/apis/cloudservers/src/test/resources/test_list_images_detail_imageextension.json
deleted file mode 100644
index e01acb2..0000000
--- a/apis/cloudservers/src/test/resources/test_list_images_detail_imageextension.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "images" : [
- {
- "id" : 2,
- "name" : "CentOS 5.2",
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2010-08-10T12:00:00Z",
- "status" : "ACTIVE"
- },
- {
- "id" : 743,
- "name" : "My Server Backup",
- "serverId" : 12,
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2009-07-07T09:56:16-05:00",
- "status" : "SAVING",
- "progress" : 80
- }
- ,
- {
- "id" : 744,
- "name" : "My Server Backup",
- "serverId" : 12,
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2009-07-07T09:56:16-05:00",
- "status" : "QUEUED"
- }
- ,
- {
- "id" : 745,
- "name" : "My Server Backup",
- "serverId" : 12,
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2009-07-07T09:56:16-05:00",
- "status" : "UNRECOGNIZED"
- }
- ,
- {
- "id" : 746,
- "name" : "My Server Backup",
- "serverId" : 12,
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2009-07-07T09:56:16-05:00",
- "status" : "UNKNOWN"
- }
- ,
- {
- "id" : 747,
- "name" : "My Server Backup",
- "serverId" : 12,
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2009-07-07T09:56:16-05:00",
- "status" : "PREPARING"
- }
- ,
- {
- "id" : 748,
- "name" : "My Server Backup",
- "serverId" : 12,
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2009-07-07T09:56:16-05:00",
- "status" : "FAILED"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_servers.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_servers.json b/apis/cloudservers/src/test/resources/test_list_servers.json
deleted file mode 100644
index 3be518e..0000000
--- a/apis/cloudservers/src/test/resources/test_list_servers.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "servers" : [
- {
- "id" : 1234,
- "name" : "sample-server"
- },
- {
- "id" : 5678,
- "name" : "sample-server2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_servers_detail.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_servers_detail.json b/apis/cloudservers/src/test/resources/test_list_servers_detail.json
deleted file mode 100644
index a9bc29a..0000000
--- a/apis/cloudservers/src/test/resources/test_list_servers_detail.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "servers" : [
- {
- "id" : 1234,
- "name" : "sample-server",
- "imageId" : 2,
- "flavorId" : 1,
- "hostId" : "e4d909c290d0fb1ca068ffaddf22cbd0",
- "status" : "BUILD",
- "progress" : 60,
- "addresses" : {
- "public" : [
- "67.23.10.132",
- "67.23.10.131"
- ],
- "private" : [
- "10.176.42.16"
- ]
- },
- "metadata" : {
- "Server Label" : "Web Head 1",
- "Image Version" : "2.1"
- }
- },
- {
- "id" : 5678,
- "name" : "sample-server2",
- "imageId" : 2,
- "flavorId" : 1,
- "hostId" : "9e107d9d372bb6826bd81d3542a419d6",
- "status" : "ACTIVE",
- "addresses" : {
- "public" : [
- "67.23.10.133"
- ],
- "private" : [
- "10.176.42.17"
- ]
- },
- "metadata" : {
- "Server Label" : "DB 1"
- }
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_sharedipgroups.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_sharedipgroups.json b/apis/cloudservers/src/test/resources/test_list_sharedipgroups.json
deleted file mode 100644
index 73717c4..0000000
--- a/apis/cloudservers/src/test/resources/test_list_sharedipgroups.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "sharedIpGroups" : [
- {
- "id" : 1234,
- "name" : "Shared IP Group 1"
- },
- {
- "id" : 5678,
- "name" : "Shared IP Group 2"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/cloudservers/src/test/resources/test_list_sharedipgroups_detail.json
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/test_list_sharedipgroups_detail.json b/apis/cloudservers/src/test/resources/test_list_sharedipgroups_detail.json
deleted file mode 100644
index de6e3733..0000000
--- a/apis/cloudservers/src/test/resources/test_list_sharedipgroups_detail.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "sharedIpGroups" : [
- {
- "id" : 1234,
- "name" : "Shared IP Group 1",
- "servers" : [422, 3445]
- },
- {
- "id" : 5678,
- "name" : "Shared IP Group 2",
- "servers" : [23203, 2456, 9891]
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/apis/pom.xml
----------------------------------------------------------------------
diff --git a/apis/pom.xml b/apis/pom.xml
index e374d04..a461ddc 100644
--- a/apis/pom.xml
+++ b/apis/pom.xml
@@ -47,7 +47,6 @@
<module>openstack-nova-ec2</module>
<module>openstack-trove</module>
<module>cloudfiles</module>
- <module>cloudservers</module>
<module>rackspace-cloudidentity</module>
<module>rackspace-cloudloadbalancers</module>
<module>rackspace-clouddns</module>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/providers/cloudservers-uk/README.txt
----------------------------------------------------------------------
diff --git a/providers/cloudservers-uk/README.txt b/providers/cloudservers-uk/README.txt
deleted file mode 100644
index 5cb9628..0000000
--- a/providers/cloudservers-uk/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# The jclouds provider for Rackspace's UK Cloud Servers (http://www.rackspacecloud.com/cloud_hosting_products/servers/).
-#
-# Expects the jclouds cloudservers API to be present on your application's classpath.
-#
-# TODO: Implementation status.
-# TODO: Supported features.
-# TODO: Usage example.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/providers/cloudservers-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml
deleted file mode 100644
index 97fd53e..0000000
--- a/providers/cloudservers-uk/pom.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-project</artifactId>
- <version>1.7.4-SNAPSHOT</version>
- <relativePath>../../project/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.jclouds.provider</groupId>
- <artifactId>cloudservers-uk</artifactId>
- <name>jclouds CloudServers UK provider</name>
- <description>CloudServers implementation targeted to Rackspace UK</description>
- <packaging>bundle</packaging>
-
- <properties>
- <test.cloudservers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudservers-uk.endpoint>
- <test.cloudservers-uk.api-version>1.0</test.cloudservers-uk.api-version>
- <test.cloudservers-uk.build-version />
- <test.cloudservers-uk.identity>${test.rackspace-uk.identity}</test.cloudservers-uk.identity>
- <test.cloudservers-uk.credential>${test.rackspace-uk.credential}</test.cloudservers-uk.credential>
- <test.cloudservers-uk.template />
- <jclouds.osgi.export>org.jclouds.rackspace.cloudservers*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.common</groupId>
- <artifactId>openstack-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>cloudservers</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>cloudservers</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.cloudservers-uk.endpoint>${test.cloudservers-uk.endpoint}</test.cloudservers-uk.endpoint>
- <test.cloudservers-uk.api-version>${test.cloudservers-uk.api-version}</test.cloudservers-uk.api-version>
- <test.cloudservers-uk.build-version>${test.cloudservers-uk.build-version}</test.cloudservers-uk.build-version>
- <test.cloudservers-uk.identity>${test.cloudservers-uk.identity}</test.cloudservers-uk.identity>
- <test.cloudservers-uk.credential>${test.cloudservers-uk.credential}</test.cloudservers-uk.credential>
- <test.cloudservers-uk.template>${test.cloudservers-uk.template}</test.cloudservers-uk.template>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java b/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java
deleted file mode 100644
index 6329838..0000000
--- a/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java
+++ /dev/null
@@ -1,82 +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.rackspace.cloudservers;
-
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.cloudservers.CloudServersApiMetadata;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Servers UK.
- *
- * @author Adrian Cole
- */
-public class CloudServersUKProviderMetadata extends BaseProviderMetadata {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return builder().fromProviderMetadata(this);
- }
-
- public CloudServersUKProviderMetadata() {
- super(builder());
- }
-
- public CloudServersUKProviderMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = new Properties();
- properties.setProperty(PROPERTY_REGIONS, "UK");
- return properties;
- }
- public static class Builder extends BaseProviderMetadata.Builder {
-
- protected Builder() {
- id("cloudservers-uk")
- .name("Rackspace Cloud Servers UK")
- .apiMetadata(new CloudServersApiMetadata())
- .endpoint("https://lon.auth.api.rackspacecloud.com")
- .homepage(URI.create("http://www.rackspace.co.uk/cloud-hosting/cloud-products/cloud-servers"))
- .console(URI.create("https://lon.manage.rackspacecloud.com"))
- .linkedServices("cloudloadbalancers-uk", "cloudservers-uk", "cloudfiles-uk")
- .iso3166Codes("GB-SLG");
- }
-
- @Override
- public CloudServersUKProviderMetadata build() {
- return new CloudServersUKProviderMetadata(this);
- }
-
- @Override
- public Builder fromProviderMetadata(
- ProviderMetadata in) {
- super.fromProviderMetadata(in);
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/providers/cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 97c2842..0000000
--- a/providers/cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudservers.CloudServersUKProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersUKClientLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersUKClientLiveTest.java b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersUKClientLiveTest.java
deleted file mode 100644
index c57a762..0000000
--- a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersUKClientLiveTest.java
+++ /dev/null
@@ -1,31 +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.rackspace.cloudservers;
-
-import org.jclouds.cloudservers.CloudServersClientLiveTest;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Adrian Cole
- */
-@Test(groups = "live", sequential = true)
-public class CloudServersUKClientLiveTest extends CloudServersClientLiveTest {
- public CloudServersUKClientLiveTest() {
- provider = "cloudservers-uk";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderTest.java b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderTest.java
deleted file mode 100644
index 6d29710..0000000
--- a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderTest.java
+++ /dev/null
@@ -1,50 +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.
- */
-/**
- *
- *
- * ====================================================================
- * Licensed 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.rackspace.cloudservers;
-
-import org.jclouds.cloudservers.CloudServersApiMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit", testName = "CloudServersUKProviderTest")
-public class CloudServersUKProviderTest extends BaseProviderMetadataTest {
-
- public CloudServersUKProviderTest() {
- super(new CloudServersUKProviderMetadata(), new CloudServersApiMetadata());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java
deleted file mode 100644
index 91a9830..0000000
--- a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java
+++ /dev/null
@@ -1,34 +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.rackspace.cloudservers.compute;
-
-import org.jclouds.cloudservers.compute.CloudServersComputeServiceLiveTest;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Adrian Cole
- */
-@Test(groups = "live", singleThreaded = true, testName = "CloudServersUKComputeServiceLiveTest")
-public class CloudServersUKComputeServiceLiveTest extends CloudServersComputeServiceLiveTest {
-
- public CloudServersUKComputeServiceLiveTest() {
- provider = "cloudservers-uk";
- group = "cs";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java
deleted file mode 100644
index d3a6c92..0000000
--- a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java
+++ /dev/null
@@ -1,56 +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.rackspace.cloudservers.compute;
-
-import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
-import static org.testng.Assert.assertEquals;
-
-import java.util.Set;
-
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.internal.BaseTemplateBuilderLiveTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- *
- * @author Adrian Cole
- */
-@Test(groups = "live")
-public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
-
- public CloudServersUKTemplateBuilderLiveTest() {
- provider = "cloudservers-uk";
- }
-
- @Test
- public void testTemplateBuilder() {
- Template defaultTemplate = this.view.getComputeService().templateBuilder().build();
- assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11.10");
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
- assertEquals(defaultTemplate.getLocation().getId(), provider);
- assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
- }
-
- @Override
- protected Set<String> getIso3166Codes() {
- return ImmutableSet.<String> of("GB-SLG");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/42cc3ce5/providers/cloudservers-us/README.txt
----------------------------------------------------------------------
diff --git a/providers/cloudservers-us/README.txt b/providers/cloudservers-us/README.txt
deleted file mode 100644
index b8eb4d7..0000000
--- a/providers/cloudservers-us/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# The jclouds provider for Rackspace's US Cloud Servers (http://www.rackspacecloud.com/cloud_hosting_products/servers/).
-#
-# Expects the jclouds cloudservers API to be present on your application's classpath.
-#
-# TODO: Implementation status.
-# TODO: Supported features.
-# TODO: Usage example.