Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed rackspace providers

This commit is contained in:
Adrian Cole 2012-06-08 15:43:23 -07:00
parent 73e026b314
commit 8d700e4e11
30 changed files with 88 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
labs/cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.cloudidentity.v2_0.CloudIdentityApiMetadata

1
labs/cloudservers-nova-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
View File

@ -1 +0,0 @@
org.jclouds.cloudservers_nova.us.CloudServersUSProviderMetadata

4
labs/pom.xml
View File

@ -47,7 +47,7 @@
<module>openstack-glance</module>
<module>joyent-sdc</module>
<module>openstack-quantum</module>
<module>cloudidentity</module>
<module>cloudservers-nova-us</module>
<module>rackspace-cloudidentity</module>
<module>rackspace-cloudservers-us</module>
</modules>
</project>

26
labs/cloudidentity/pom.xml → labs/rackspace-cloudidentity/pom.xml
View File

@ -28,22 +28,22 @@
<relativePath>../../project/pom.xml</relativePath>
</parent>
<groupId>org.jclouds.labs</groupId>
<artifactId>cloudidentity</artifactId>
<name>jcloud cloudidentity api</name>
<artifactId>rackspace-cloudidentity</artifactId>
<name>jcloud rackspace cloudidentity api</name>
<description>jclouds components to access an implementation of Rackspace Cloud Identity</description>
<packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
<test.cloudidentity.endpoint>https://identity.api.rackspacecloud.com</test.cloudidentity.endpoint>
<test.rackspace-cloudidentity.endpoint>https://identity.api.rackspacecloud.com</test.rackspace-cloudidentity.endpoint>
<!-- keystone version -->
<test.cloudidentity.api-version>2.0</test.cloudidentity.api-version>
<test.cloudidentity.build-version></test.cloudidentity.build-version>
<test.cloudidentity.identity>413274:${test.rackspace-us.identity}</test.cloudidentity.identity>
<test.cloudidentity.credential>${test.rackspace-us.credential}</test.cloudidentity.credential>
<test.rackspace-cloudidentity.api-version>2.0</test.rackspace-cloudidentity.api-version>
<test.rackspace-cloudidentity.build-version></test.rackspace-cloudidentity.build-version>
<test.rackspace-cloudidentity.identity>413274:${test.rackspace-us.identity}</test.rackspace-cloudidentity.identity>
<test.rackspace-cloudidentity.credential>${test.rackspace-us.credential}</test.rackspace-cloudidentity.credential>
<test.jclouds.keystone.credential-type>RAX-KSKEY:apiKeyCredentials</test.jclouds.keystone.credential-type>
<jclouds.osgi.export>org.jclouds.cloudidentity.v2_0*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.export>org.jclouds.rackspace.cloudidentity.v2_0*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>
org.jclouds.rest.internal;version="${project.version}",
org.jclouds*;version="${project.version}",
@ -102,11 +102,11 @@
</goals>
<configuration>
<systemPropertyVariables>
<test.cloudidentity.endpoint>${test.cloudidentity.endpoint}</test.cloudidentity.endpoint>
<test.cloudidentity.api-version>${test.cloudidentity.api-version}</test.cloudidentity.api-version>
<test.cloudidentity.build-version>${test.cloudidentity.build-version}</test.cloudidentity.build-version>
<test.cloudidentity.identity>${test.cloudidentity.identity}</test.cloudidentity.identity>
<test.cloudidentity.credential>${test.cloudidentity.credential}</test.cloudidentity.credential>
<test.rackspace-cloudidentity.endpoint>${test.rackspace-cloudidentity.endpoint}</test.rackspace-cloudidentity.endpoint>
<test.rackspace-cloudidentity.api-version>${test.rackspace-cloudidentity.api-version}</test.rackspace-cloudidentity.api-version>
<test.rackspace-cloudidentity.build-version>${test.rackspace-cloudidentity.build-version}</test.rackspace-cloudidentity.build-version>
<test.rackspace-cloudidentity.identity>${test.rackspace-cloudidentity.identity}</test.rackspace-cloudidentity.identity>
<test.rackspace-cloudidentity.credential>${test.rackspace-cloudidentity.credential}</test.rackspace-cloudidentity.credential>
<test.jclouds.keystone.credential-type>${test.jclouds.keystone.credential-type}</test.jclouds.keystone.credential-type>
</systemPropertyVariables>
</configuration>

8
labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityApiMetadata.java → labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
View File

@ -1,4 +1,4 @@
package org.jclouds.cloudidentity.v2_0;
package org.jclouds.rackspace.cloudidentity.v2_0;
/**
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
@ -25,11 +25,11 @@ import java.net.URI;
import java.util.Properties;
import org.jclouds.apis.ApiMetadata;
import org.jclouds.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import org.jclouds.cloudidentity.v2_0.config.CloudIdentityRestClientModule;
import org.jclouds.openstack.keystone.v2_0.KeystoneApiMetadata;
import org.jclouds.openstack.keystone.v2_0.KeystoneAsyncClient;
import org.jclouds.openstack.keystone.v2_0.KeystoneClient;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityRestClientModule;
import org.jclouds.rest.RestContext;
import com.google.common.collect.ImmutableSet;
@ -77,7 +77,7 @@ public class CloudIdentityApiMetadata extends KeystoneApiMetadata {
public static class Builder extends KeystoneApiMetadata.Builder {
protected Builder(){
super(KeystoneClient.class, KeystoneAsyncClient.class);
id("cloudidentity")
id("rackspace-cloudidentity")
.name("Rackspace Cloud Identity Service")
.defaultEndpoint("https://identity.api.rackspacecloud.com")
.identityName("username")

4
labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityAuthenticationAsyncClient.java → labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationAsyncClient.java
View File

@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0;
package org.jclouds.rackspace.cloudidentity.v2_0;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.core.MediaType;
import org.jclouds.cloudidentity.v2_0.domain.ApiKeyCredentials;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.openstack.keystone.v2_0.AuthenticationAsyncClient;
import org.jclouds.openstack.keystone.v2_0.binders.BindAuthToJsonPayload;
import org.jclouds.openstack.keystone.v2_0.domain.Access;
import org.jclouds.rackspace.cloudidentity.v2_0.domain.ApiKeyCredentials;
import org.jclouds.rest.annotations.MapBinder;
import org.jclouds.rest.annotations.PayloadParam;
import org.jclouds.rest.annotations.SelectJson;

4
labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityAuthenticationClient.java → labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationClient.java
View File

@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0;
package org.jclouds.rackspace.cloudidentity.v2_0;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudidentity.v2_0.domain.ApiKeyCredentials;
import org.jclouds.concurrent.Timeout;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.openstack.keystone.v2_0.AuthenticationAsyncClient;
import org.jclouds.openstack.keystone.v2_0.AuthenticationClient;
import org.jclouds.openstack.keystone.v2_0.domain.Access;
import org.jclouds.rackspace.cloudidentity.v2_0.domain.ApiKeyCredentials;
/**
* Provides synchronous access to the KeyStone Service API.

8
labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityAuthenticationModule.java → labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityAuthenticationModule.java
View File

@ -16,15 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0.config;
package org.jclouds.rackspace.cloudidentity.v2_0.config;
import static org.jclouds.rest.config.BinderUtils.bindClientAndAsyncClient;
import java.util.Map;
import org.jclouds.cloudidentity.v2_0.CloudIdentityAuthenticationAsyncClient;
import org.jclouds.cloudidentity.v2_0.CloudIdentityAuthenticationClient;
import org.jclouds.cloudidentity.v2_0.functions.AuthenticateApiKeyCredentials;
import org.jclouds.domain.Credentials;
import org.jclouds.openstack.keystone.v2_0.AuthenticationAsyncClient;
import org.jclouds.openstack.keystone.v2_0.AuthenticationClient;
@ -32,6 +29,9 @@ import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
import org.jclouds.openstack.keystone.v2_0.domain.Access;
import org.jclouds.openstack.keystone.v2_0.functions.AuthenticatePasswordCredentials;
import org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityAuthenticationAsyncClient;
import org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityAuthenticationClient;
import org.jclouds.rackspace.cloudidentity.v2_0.functions.AuthenticateApiKeyCredentials;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;

2
labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityCredentialTypes.java → labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityCredentialTypes.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0.config;
package org.jclouds.rackspace.cloudidentity.v2_0.config;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;

2
labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityRestClientModule.java → labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityRestClientModule.java
View File

@ -1,4 +1,4 @@
package org.jclouds.cloudidentity.v2_0.config;
package org.jclouds.rackspace.cloudidentity.v2_0.config;
import org.jclouds.location.config.LocationModule;
import org.jclouds.openstack.keystone.v2_0.KeystoneAsyncClient;

4
labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/domain/ApiKeyCredentials.java → labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java
View File

@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0.domain;
package org.jclouds.rackspace.cloudidentity.v2_0.domain;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import com.google.common.base.Objects;

8
labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java → labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java
View File

@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0.functions;
package org.jclouds.rackspace.cloudidentity.v2_0.functions;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.jclouds.cloudidentity.v2_0.CloudIdentityAuthenticationClient;
import org.jclouds.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import org.jclouds.cloudidentity.v2_0.domain.ApiKeyCredentials;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
import org.jclouds.openstack.keystone.v2_0.domain.Access;
import org.jclouds.openstack.keystone.v2_0.functions.internal.BaseAuthenticator;
import org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityAuthenticationClient;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import org.jclouds.rackspace.cloudidentity.v2_0.domain.ApiKeyCredentials;
/**
*

1
labs/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata Normal file
View File

@ -0,0 +1 @@
org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityApiMetadata

3
labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/CloudIdentityApiMetadataTest.java → labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadataTest.java
View File

@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0;
package org.jclouds.rackspace.cloudidentity.v2_0;
import org.jclouds.View;
import org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityApiMetadata;
import org.jclouds.rest.internal.BaseRestApiMetadataTest;
import org.testng.annotations.Test;

4
labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/CloudIdentityClientLiveTest.java → labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0;
package org.jclouds.rackspace.cloudidentity.v2_0;
import org.jclouds.openstack.keystone.v2_0.KeystoneClientLiveTest;
import org.testng.annotations.Test;
@ -28,6 +28,6 @@ import org.testng.annotations.Test;
@Test(groups = "live", testName = "CloudIdentityClientLiveTest", singleThreaded = true)
public class CloudIdentityClientLiveTest extends KeystoneClientLiveTest {
public CloudIdentityClientLiveTest() {
provider = "cloudidentity";
provider = "rackspace-cloudidentity";
}
}

4
labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityServiceClientLiveTest.java → labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityServiceClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0.features;
package org.jclouds.rackspace.cloudidentity.v2_0.features;
import org.jclouds.openstack.keystone.v2_0.features.ServiceClientLiveTest;
import org.testng.annotations.Test;
@ -28,6 +28,6 @@ import org.testng.annotations.Test;
@Test(groups = "live", testName = "CloudIdentityServiceClientLiveTest", singleThreaded = true)
public class CloudIdentityServiceClientLiveTest extends ServiceClientLiveTest {
public CloudIdentityServiceClientLiveTest() {
provider = "cloudidentity";
provider = "rackspace-cloudidentity";
}
}

4
labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityTenantClientLiveTest.java → labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTenantClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0.features;
package org.jclouds.rackspace.cloudidentity.v2_0.features;
import org.jclouds.openstack.keystone.v2_0.features.TenantClientLiveTest;
import org.testng.annotations.Test;
@ -28,6 +28,6 @@ import org.testng.annotations.Test;
@Test(groups = "live", testName = "CloudIdentityTenantClientLiveTest", singleThreaded = true)
public class CloudIdentityTenantClientLiveTest extends TenantClientLiveTest {
public CloudIdentityTenantClientLiveTest() {
provider = "cloudidentity";
provider = "rackspace-cloudidentity";
}
}

4
labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityTokenClientLiveTest.java → labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTokenClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0.features;
package org.jclouds.rackspace.cloudidentity.v2_0.features;
import org.jclouds.openstack.keystone.v2_0.features.TokenClientLiveTest;
import org.testng.annotations.Test;
@ -28,6 +28,6 @@ import org.testng.annotations.Test;
@Test(groups = "live", testName = "CloudIdentityTokenClientLiveTest", singleThreaded = true)
public class CloudIdentityTokenClientLiveTest extends TokenClientLiveTest {
public CloudIdentityTokenClientLiveTest() {
provider = "cloudidentity";
provider = "rackspace-cloudidentity";
}
}

4
labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityUserClientLiveTest.java → labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityUserClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudidentity.v2_0.features;
package org.jclouds.rackspace.cloudidentity.v2_0.features;
import org.jclouds.openstack.keystone.v2_0.features.UserClientLiveTest;
import org.testng.annotations.Test;
@ -28,6 +28,6 @@ import org.testng.annotations.Test;
@Test(groups = "live", testName = "CloudIdentityUserClientLiveTest", singleThreaded = true)
public class CloudIdentityUserClientLiveTest extends UserClientLiveTest {
public CloudIdentityUserClientLiveTest() {
provider = "cloudidentity";
provider = "rackspace-cloudidentity";
}
}

40
labs/cloudservers-nova-us/pom.xml → labs/rackspace-cloudservers-us/pom.xml
View File

@ -28,22 +28,22 @@
<relativePath>../../project/pom.xml</relativePath>
</parent>
<groupId>org.jclouds.labs</groupId>
<artifactId>cloudservers-nova-us</artifactId>
<artifactId>rackspace-cloudservers-us</artifactId>
<name>jclouds Rackspace Next Generation Cloud Servers provider</name>
<description>OpenStack Nova implementation targeted to Rackspace Next Generation Cloud Servers</description>
<packaging>bundle</packaging>
<properties>
<test.cloudservers-nova-us.endpoint>https://identity.api.rackspacecloud.com</test.cloudservers-nova-us.endpoint>
<test.cloudservers-nova-us.api-version>2</test.cloudservers-nova-us.api-version>
<test.cloudservers-nova-us.build-version></test.cloudservers-nova-us.build-version>
<test.cloudservers-nova-us.identity>${test.rackspace-us.identity}</test.cloudservers-nova-us.identity>
<test.cloudservers-nova-us.credential>${test.rackspace-us.credential}</test.cloudservers-nova-us.credential>
<test.cloudservers-nova-us.image-id></test.cloudservers-nova-us.image-id>
<test.cloudservers-nova-us.image.login-user></test.cloudservers-nova-us.image.login-user>
<test.cloudservers-nova-us.image.authenticate-sudo></test.cloudservers-nova-us.image.authenticate-sudo>
<test.rackspace-cloudservers-us.endpoint>https://identity.api.rackspacecloud.com</test.rackspace-cloudservers-us.endpoint>
<test.rackspace-cloudservers-us.api-version>2</test.rackspace-cloudservers-us.api-version>
<test.rackspace-cloudservers-us.build-version></test.rackspace-cloudservers-us.build-version>
<test.rackspace-cloudservers-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudservers-us.identity>
<test.rackspace-cloudservers-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudservers-us.credential>
<test.rackspace-cloudservers-us.image-id></test.rackspace-cloudservers-us.image-id>
<test.rackspace-cloudservers-us.image.login-user></test.rackspace-cloudservers-us.image.login-user>
<test.rackspace-cloudservers-us.image.authenticate-sudo></test.rackspace-cloudservers-us.image.authenticate-sudo>
<jclouds.osgi.export>org.jclouds.cloudservers_nova.us*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.export>org.jclouds.rackspace.cloudservers.us*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>
org.jclouds.compute.internal;version="${project.version}",
org.jclouds.rest.internal;version="${project.version}",
@ -55,7 +55,7 @@
<dependencies>
<dependency>
<groupId>org.jclouds.labs</groupId>
<artifactId>cloudidentity</artifactId>
<artifactId>rackspace-cloudidentity</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@ -79,7 +79,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.labs</groupId>
<artifactId>cloudidentity</artifactId>
<artifactId>rackspace-cloudidentity</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@ -129,14 +129,14 @@
<configuration>
<threadCount>1</threadCount>
<systemPropertyVariables>
<test.cloudservers-nova-us.endpoint>${test.cloudservers-nova-us.endpoint}</test.cloudservers-nova-us.endpoint>
<test.cloudservers-nova-us.api-version>${test.cloudservers-nova-us.api-version}</test.cloudservers-nova-us.api-version>
<test.cloudservers-nova-us.build-version>${test.cloudservers-nova-us.build-version}</test.cloudservers-nova-us.build-version>
<test.cloudservers-nova-us.identity>${test.cloudservers-nova-us.identity}</test.cloudservers-nova-us.identity>
<test.cloudservers-nova-us.credential>${test.cloudservers-nova-us.credential}</test.cloudservers-nova-us.credential>
<test.cloudservers-nova-us.image-id>${test.cloudservers-nova-us.image-id}</test.cloudservers-nova-us.image-id>
<test.cloudservers-nova-us.image.login-user>${test.cloudservers-nova-us.image.login-user}</test.cloudservers-nova-us.image.login-user>
<test.cloudservers-nova-us.image.authenticate-sudo>${test.cloudservers-nova-us.image.authenticate-sudo}</test.cloudservers-nova-us.image.authenticate-sudo>
<test.rackspace-cloudservers-us.endpoint>${test.rackspace-cloudservers-us.endpoint}</test.rackspace-cloudservers-us.endpoint>
<test.rackspace-cloudservers-us.api-version>${test.rackspace-cloudservers-us.api-version}</test.rackspace-cloudservers-us.api-version>
<test.rackspace-cloudservers-us.build-version>${test.rackspace-cloudservers-us.build-version}</test.rackspace-cloudservers-us.build-version>
<test.rackspace-cloudservers-us.identity>${test.rackspace-cloudservers-us.identity}</test.rackspace-cloudservers-us.identity>
<test.rackspace-cloudservers-us.credential>${test.rackspace-cloudservers-us.credential}</test.rackspace-cloudservers-us.credential>
<test.rackspace-cloudservers-us.image-id>${test.rackspace-cloudservers-us.image-id}</test.rackspace-cloudservers-us.image-id>
<test.rackspace-cloudservers-us.image.login-user>${test.rackspace-cloudservers-us.image.login-user}</test.rackspace-cloudservers-us.image.login-user>
<test.rackspace-cloudservers-us.image.authenticate-sudo>${test.rackspace-cloudservers-us.image.authenticate-sudo}</test.rackspace-cloudservers-us.image.authenticate-sudo>
</systemPropertyVariables>
</configuration>
</execution>

10
labs/cloudservers-nova-us/src/main/java/org/jclouds/cloudservers_nova/us/CloudServersUSProviderMetadata.java → labs/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudservers_nova.us;
package org.jclouds.rackspace.cloudservers.us;
import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
@ -24,13 +24,13 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CRED
import java.net.URI;
import java.util.Properties;
import org.jclouds.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import org.jclouds.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule.CloudIdentityAuthenticationModuleForZones;
import org.jclouds.openstack.nova.v2_0.NovaApiMetadata;
import org.jclouds.openstack.nova.v2_0.compute.config.NovaComputeServiceContextModule;
import org.jclouds.openstack.nova.v2_0.config.NovaRestClientModule;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule.CloudIdentityAuthenticationModuleForZones;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
@ -73,7 +73,7 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata {
public static class Builder extends BaseProviderMetadata.Builder {
protected Builder(){
id("cloudservers-nova-us")
id("rackspace-cloudservers-us")
.name("Rackspace Next Generation Cloud Servers")
.apiMetadata(new NovaApiMetadata().toBuilder()
.identityName("username")
@ -84,7 +84,7 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata {
.build())
.homepage(URI.create("http://www.rackspace.com/cloud/nextgen"))
.console(URI.create("https://mycloud.rackspace.com"))
.linkedServices("cloudservers-nova-us", "cloudfiles-swift-us")
.linkedServices("rackspace-cloudservers-us", "cloudfiles-swift-us")
.iso3166Codes("US-TX")
.endpoint("https://identity.api.rackspacecloud.com")
.defaultProperties(CloudServersUSProviderMetadata.defaultProperties());

1
labs/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata Normal file
View File

@ -0,0 +1 @@
org.jclouds.rackspace.cloudservers.us.CloudServersUSProviderMetadata

3
labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/CloudServersUSProviderTest.java → labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderTest.java
View File

@ -33,10 +33,11 @@
* limitations under the License.
* ====================================================================
*/
package org.jclouds.cloudservers_nova.us;
package org.jclouds.rackspace.cloudservers.us;
import org.jclouds.openstack.nova.v2_0.NovaApiMetadata;
import org.jclouds.providers.internal.BaseProviderMetadataTest;
import org.jclouds.rackspace.cloudservers.us.CloudServersUSProviderMetadata;
import org.testng.annotations.Test;
/**

4
labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/CloudServersUSComputeServiceLiveTest.java → labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSComputeServiceLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudservers_nova.us.compute;
package org.jclouds.rackspace.cloudservers.us.compute;
import org.jclouds.openstack.nova.v2_0.compute.NovaComputeServiceLiveTest;
import org.testng.annotations.Test;
@ -29,6 +29,6 @@ import org.testng.annotations.Test;
public class CloudServersUSComputeServiceLiveTest extends NovaComputeServiceLiveTest {
public CloudServersUSComputeServiceLiveTest() {
provider = "cloudservers-nova-us";
provider = "rackspace-cloudservers-us";
}
}

4
labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/CloudServersUSTemplateBuilderLiveTest.java → labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudservers_nova.us.compute;
package org.jclouds.rackspace.cloudservers.us.compute;
import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
import static org.testng.Assert.assertEquals;
@ -42,7 +42,7 @@ import com.google.common.collect.ImmutableSet;
public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
public CloudServersUSTemplateBuilderLiveTest() {
provider = "cloudservers-nova-us";
provider = "rackspace-cloudservers-us";
}
@Override

4
labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/extensions/CloudServersUSImageExtensionLivetest.java → labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/extensions/CloudServersUSImageExtensionLivetest.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.jclouds.cloudservers_nova.us.compute.extensions;
package org.jclouds.rackspace.cloudservers.us.compute.extensions;
import org.jclouds.compute.extensions.internal.BaseImageExtensionLiveTest;
import org.jclouds.sshj.config.SshjSshClientModule;
@ -34,7 +34,7 @@ import com.google.inject.Module;
public class CloudServersUSImageExtensionLivetest extends BaseImageExtensionLiveTest {
public CloudServersUSImageExtensionLivetest() {
provider = "cloudservers-nova-us";
provider = "rackspace-cloudservers-us";
}
@Override

4
labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSFlavorClientLiveTest.java → labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSFlavorClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudservers_nova.us.features;
package org.jclouds.rackspace.cloudservers.us.features;
import org.jclouds.openstack.nova.v2_0.features.FlavorClientLiveTest;
import org.testng.annotations.Test;
@ -28,7 +28,7 @@ import org.testng.annotations.Test;
@Test(groups = "live", testName = "CloudServersUSFlavorClientLiveTest")
public class CloudServersUSFlavorClientLiveTest extends FlavorClientLiveTest {
public CloudServersUSFlavorClientLiveTest() {
provider = "cloudservers-nova-us";
provider = "rackspace-cloudservers-us";
}
}

4
labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSImageClientLiveTest.java → labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSImageClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudservers_nova.us.features;
package org.jclouds.rackspace.cloudservers.us.features;
import org.jclouds.openstack.nova.v2_0.features.ImageClientLiveTest;
import org.testng.annotations.Test;
@ -28,6 +28,6 @@ import org.testng.annotations.Test;
@Test(groups = "live", testName = "CloudServersUSImageClientLiveTest")
public class CloudServersUSImageClientLiveTest extends ImageClientLiveTest {
public CloudServersUSImageClientLiveTest() {
provider = "cloudservers-nova-us";
provider = "rackspace-cloudservers-us";
}
}

4
labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSServerClientLiveTest.java → labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSServerClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.cloudservers_nova.us.features;
package org.jclouds.rackspace.cloudservers.us.features;
import org.jclouds.openstack.nova.v2_0.features.ServerClientLiveTest;
import org.testng.annotations.Test;
@ -28,7 +28,7 @@ import org.testng.annotations.Test;
@Test(groups = "live", testName = "CloudServersUSServerClientLiveTest")
public class CloudServersUSServerClientLiveTest extends ServerClientLiveTest {
public CloudServersUSServerClientLiveTest() {
provider = "cloudservers-nova-us";
provider = "rackspace-cloudservers-us";
}
}

0
labs/cloudservers-nova-us/src/test/resources/raxImages.json → labs/rackspace-cloudservers-us/src/test/resources/raxImages.json
View File