Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-16 06:56:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue 801:fix inconsistency in test property test.provider.apiversion set in pom.xml -> api-version

Browse Source
This commit is contained in:
Adrian Cole 2012-01-05 14:40:13 -08:00
parent 977374caef
commit d0444c954a
139 changed files with 504 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/atmos/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.atmos.blobstore.integration.AtmosStorageTestInitializer</test.initializer>
<test.atmos.endpoint>https://accesspoint.atmos.com</test.atmos.endpoint>
<test.atmos.apiversion>1.3.0</test.atmos.apiversion>
<test.atmos.api-version>1.3.0</test.atmos.api-version>
<test.atmos.identity>FIXME</test.atmos.identity>
<test.atmos.credential>FIXME</test.atmos.credential>
</properties>
@ -96,8 +96,8 @@
<value>${test.atmos.endpoint}</value>
</property>
<property>
<name>test.atmos.apiversion</name>
<value>${test.atmos.apiversion}</value>
<name>test.atmos.api-version</name>
<value>${test.atmos.api-version}</value>
</property>
<property>
<name>test.atmos.identity</name>

4
apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java
View File

@ -38,10 +38,10 @@ public class AtmosTestInitializer extends TransientBlobStoreTestInitializer {
}
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential));
}
}

6
apis/cloudfiles/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer</test.initializer>
<test.cloudfiles.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles.endpoint>
<test.cloudfiles.apiversion>1.0</test.cloudfiles.apiversion>
<test.cloudfiles.api-version>1.0</test.cloudfiles.api-version>
<test.cloudfiles.identity>${test.rackspace.identity}</test.cloudfiles.identity>
<test.cloudfiles.credential>${test.rackspace.credential}</test.cloudfiles.credential>
</properties>
@ -111,8 +111,8 @@
<value>${test.cloudfiles.endpoint}</value>
</property>
<property>
<name>test.cloudfiles.apiversion</name>
<value>${test.cloudfiles.apiversion}</value>
<name>test.cloudfiles.api-version</name>
<value>${test.cloudfiles.api-version}</value>
</property>
<property>
<name>test.cloudfiles.identity</name>

6
apis/cloudservers/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.cloudservers.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers.endpoint>
<test.cloudservers.apiversion>1.0</test.cloudservers.apiversion>
<test.cloudservers.api-version>1.0</test.cloudservers.api-version>
<test.cloudservers.identity>${test.rackspace.identity}</test.cloudservers.identity>
<test.cloudservers.credential>${test.rackspace.credential}</test.cloudservers.credential>
</properties>
@ -109,8 +109,8 @@
<value>${test.cloudservers.endpoint}</value>
</property>
<property>
<name>test.cloudservers.apiversion</name>
<value>${test.cloudservers.apiversion}</value>
<name>test.cloudservers.api-version</name>
<value>${test.cloudservers.api-version}</value>
</property>
<property>
<name>test.cloudservers.identity</name>

8
apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientLiveTest.java
View File

@ -87,14 +87,14 @@ public class CloudServersClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -105,8 +105,8 @@ public class CloudServersClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
apis/cloudsigma/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.cloudsigma.endpoint>https://api.cloudsigma.com</test.cloudsigma.endpoint>
<test.cloudsigma.apiversion>1.0</test.cloudsigma.apiversion>
<test.cloudsigma.api-version>1.0</test.cloudsigma.api-version>
<test.cloudsigma.identity>FIXME</test.cloudsigma.identity>
<test.cloudsigma.credential>FIXME</test.cloudsigma.credential>
</properties>
@ -95,8 +95,8 @@
<value>${test.cloudsigma.endpoint}</value>
</property>
<property>
<name>test.cloudsigma.apiversion</name>
<value>${test.cloudsigma.apiversion}</value>
<name>test.cloudsigma.api-version</name>
<value>${test.cloudsigma.api-version}</value>
</property>
<property>
<name>test.cloudsigma.identity</name>

8
apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java
View File

@ -73,14 +73,14 @@ public class CloudSigmaClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected Predicate<DriveInfo> driveNotClaimed;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -92,8 +92,8 @@ public class CloudSigmaClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
apis/cloudwatch/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.cloudwatch.endpoint>
<test.cloudwatch.apiversion>2009-05-15</test.cloudwatch.apiversion>
<test.cloudwatch.api-version>2009-05-15</test.cloudwatch.api-version>
<test.cloudwatch.identity>${test.aws.identity}</test.cloudwatch.identity>
<test.cloudwatch.credential>${test.aws.credential}</test.cloudwatch.credential>
</properties>
@ -90,8 +90,8 @@
<value>${test.cloudwatch.endpoint}</value>
</property>
<property>
<name>test.cloudwatch.apiversion</name>
<value>${test.cloudwatch.apiversion}</value>
<name>test.cloudwatch.api-version</name>
<value>${test.cloudwatch.api-version}</value>
</property>
<property>
<name>test.cloudwatch.identity</name>

8
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java
View File

@ -49,14 +49,14 @@ public class CloudWatchClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint", null);
apiversion = System.getProperty("test." + provider + ".apiversion", null);
apiVersion = System.getProperty("test." + provider + ".api-version", null);
}
protected Properties setupProperties() {
@ -67,8 +67,8 @@ public class CloudWatchClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
apis/deltacloud/pom.xml
View File

@ -49,7 +49,7 @@
<properties>
<test.deltacloud.endpoint>http://localhost:3001/api</test.deltacloud.endpoint>
<test.deltacloud.apiversion>0.3.0</test.deltacloud.apiversion>
<test.deltacloud.api-version>0.3.0</test.deltacloud.api-version>
<test.deltacloud.identity>mockuser</test.deltacloud.identity>
<test.deltacloud.credential>mockpassword</test.deltacloud.credential>
</properties>
@ -108,8 +108,8 @@
<value>${test.deltacloud.endpoint}</value>
</property>
<property>
<name>test.deltacloud.apiversion</name>
<value>${test.deltacloud.apiversion}</value>
<name>test.deltacloud.api-version</name>
<value>${test.deltacloud.api-version}</value>
</property>
<property>
<name>test.deltacloud.identity</name>

8
apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java
View File

@ -69,7 +69,7 @@ public class ReadOnlyDeltacloudClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected Predicate<IPSocket> socketTester;
protected ImmutableMap<State, Predicate<Instance>> stateChanges;
@ -77,7 +77,7 @@ public class ReadOnlyDeltacloudClientLiveTest {
identity = System.getProperty("test." + provider + ".identity", "mockuser");
credential = System.getProperty("test." + provider + ".credential", "mockpassword");
endpoint = System.getProperty("test." + provider + ".endpoint", "http://localhost:3001/api");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -89,8 +89,8 @@ public class ReadOnlyDeltacloudClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
apis/ec2/pom.xml
View File

@ -37,7 +37,7 @@
<!-- when instances are hung, open a ticket and add here -->
<jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
<test.ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.ec2.endpoint>
<test.ec2.apiversion>2010-06-15</test.ec2.apiversion>
<test.ec2.api-version>2010-06-15</test.ec2.api-version>
<test.ec2.identity>${test.aws.identity}</test.ec2.identity>
<test.ec2.credential>${test.aws.credential}</test.ec2.credential>
</properties>
@ -105,8 +105,8 @@
<value>${test.ec2.endpoint}</value>
</property>
<property>
<name>test.ec2.apiversion</name>
<value>${test.ec2.apiversion}</value>
<name>test.ec2.api-version</name>
<value>${test.ec2.api-version}</value>
</property>
<property>
<name>test.ec2.identity</name>

8
apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java
View File

@ -99,15 +99,15 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
+ ".apiversion");
apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
+ ".api-version");
}
protected Properties setupProperties() {
@ -117,7 +117,7 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".credential", credential);
overrides.setProperty(provider + ".endpoint", endpoint);
overrides.setProperty(provider + ".apiversion", apiversion);
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java
View File

@ -128,15 +128,15 @@ public class EBSBootEC2ClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
+ ".apiversion");
apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
+ ".api-version");
}
protected Properties setupProperties() {
@ -146,7 +146,7 @@ public class EBSBootEC2ClientLiveTest {
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".credential", credential);
overrides.setProperty(provider + ".endpoint", endpoint);
overrides.setProperty(provider + ".apiversion", apiversion);
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
apis/ec2/src/test/java/org/jclouds/ec2/compute/TestCanRecreateGroupLiveTest.java
View File

@ -52,14 +52,14 @@ public class TestCanRecreateGroupLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
@BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -71,8 +71,8 @@ public class TestCanRecreateGroupLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
apis/ec2/src/test/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java
View File

@ -63,14 +63,14 @@ public class AvailabilityZoneAndRegionClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
@BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -82,8 +82,8 @@ public class AvailabilityZoneAndRegionClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticBlockStoreClientLiveTest.java
View File

@ -67,14 +67,14 @@ public class ElasticBlockStoreClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
@BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -86,8 +86,8 @@ public class ElasticBlockStoreClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticIPAddressClientLiveTest.java
View File

@ -57,15 +57,15 @@ public class ElasticIPAddressClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
+ ".apiversion");
apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
+ ".api-version");
}
protected Properties setupProperties() {
@ -75,7 +75,7 @@ public class ElasticIPAddressClientLiveTest {
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".credential", credential);
overrides.setProperty(provider + ".endpoint", endpoint);
overrides.setProperty(provider + ".apiversion", apiversion);
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
apis/ec2/src/test/java/org/jclouds/ec2/services/InstanceClientLiveTest.java
View File

@ -56,15 +56,15 @@ public class InstanceClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
+ ".apiversion");
apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
+ ".api-version");
}
protected Properties setupProperties() {
@ -74,7 +74,7 @@ public class InstanceClientLiveTest {
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".credential", credential);
overrides.setProperty(provider + ".endpoint", endpoint);
overrides.setProperty(provider + ".apiversion", apiversion);
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
apis/ec2/src/test/java/org/jclouds/ec2/services/KeyPairClientLiveTest.java
View File

@ -58,15 +58,15 @@ public class KeyPairClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
+ ".apiversion");
apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
+ ".api-version");
}
protected Properties setupProperties() {
@ -76,7 +76,7 @@ public class KeyPairClientLiveTest {
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".credential", credential);
overrides.setProperty(provider + ".endpoint", endpoint);
overrides.setProperty(provider + ".apiversion", apiversion);
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java
View File

@ -65,14 +65,14 @@ public class SecurityGroupClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -83,8 +83,8 @@ public class SecurityGroupClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java
View File

@ -52,15 +52,15 @@ public class WindowsClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
+ ".apiversion");
apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
+ ".api-version");
}
protected Properties setupProperties() {
@ -70,7 +70,7 @@ public class WindowsClientLiveTest {
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".credential", credential);
overrides.setProperty(provider + ".endpoint", endpoint);
overrides.setProperty(provider + ".apiversion", apiversion);
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
apis/elasticstack/pom.xml
View File

@ -51,7 +51,7 @@
<!-- when instances are hung, open a ticket and add here -->
<jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
<test.elasticstack.endpoint>https://api.lon-p.elastichosts.com</test.elasticstack.endpoint>
<test.elasticstack.apiversion>1.0</test.elasticstack.apiversion>
<test.elasticstack.api-version>1.0</test.elasticstack.api-version>
<test.elasticstack.identity>FIXME</test.elasticstack.identity>
<test.elasticstack.credential>FIXME</test.elasticstack.credential>
</properties>
@ -110,8 +110,8 @@
<value>${test.elasticstack.endpoint}</value>
</property>
<property>
<name>test.elasticstack.apiversion</name>
<value>${test.elasticstack.apiversion}</value>
<name>test.elasticstack.api-version</name>
<value>${test.elasticstack.api-version}</value>
</property>
<property>
<name>test.elasticstack.identity</name>

8
apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackClientLiveTest.java
View File

@ -86,14 +86,14 @@ public class ElasticStackClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected Predicate<DriveInfo> driveNotClaimed;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -105,8 +105,8 @@ public class ElasticStackClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
apis/eucalyptus/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.eucalyptus.endpoint>http://ecc.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus.endpoint>
<test.eucalyptus.apiversion>2010-06-15</test.eucalyptus.apiversion>
<test.eucalyptus.api-version>2010-06-15</test.eucalyptus.api-version>
<test.eucalyptus.identity>FIXME_IDENTITY</test.eucalyptus.identity>
<test.eucalyptus.credential>FIXME_CREDENTIAL</test.eucalyptus.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.eucalyptus.endpoint}</value>
</property>
<property>
<name>test.eucalyptus.apiversion</name>
<value>${test.eucalyptus.apiversion}</value>
<name>test.eucalyptus.api-version</name>
<value>${test.eucalyptus.api-version}</value>
</property>
<property>
<name>test.eucalyptus.identity</name>

10
apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java
View File

@ -44,17 +44,17 @@ public class FilesystemTestInitializer extends TransientBlobStoreTestInitializer
}
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential));
}
@Override
protected Properties setupProperties(String endpoint, String apiversion, String identity, String credential) {
Properties props = super.setupProperties(endpoint, apiversion, identity, credential);
protected Properties setupProperties(String endpoint, String apiVersion, String identity, String credential) {
Properties props = super.setupProperties(endpoint, apiVersion, identity, credential);
props.setProperty(FilesystemConstants.PROPERTY_BASEDIR, TestUtils.TARGET_BASE_DIR);
return props;
}
}
}

4
apis/nova/pom.xml
View File

@ -125,8 +125,8 @@
<value>${test.nova.endpoint}</value>
</property>
<property>
<name>test.nova.apiversion</name>
<value>${test.nova.apiversion}</value>
<name>test.nova.api-version</name>
<value>${test.nova.api-version}</value>
</property>
<property>
<name>test.nova.identity</name>

66
apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java
View File

@ -78,7 +78,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
createServerOptionsVarargsClass);
HttpRequest request = processor.createRequest(method, "ralphie", 2, 1);
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, "{\"server\":{\"name\":\"ralphie\",\"imageRef\":\"2\",\"flavorRef\":\"1\"}}",
"application/json", false);
@ -98,7 +98,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
HttpRequest request = processor
.createRequest(method, "ralphie", 2, 1, withFile("/etc/jclouds", "foo".getBytes()));
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(
request,
@ -120,7 +120,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
HttpRequest request = processor.createRequest(method, "ralphie", 2, 1,
withMetadata(ImmutableMap.of("foo", "bar")));
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request,
"{\"server\":{\"name\":\"ralphie\",\"imageRef\":\"2\",\"flavorRef\":\"1\",\"metadata\":{\"foo\":\"bar\"}}}",
@ -138,7 +138,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("deleteImage", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "DELETE http://endpoint/vapiversion/images/2 HTTP/1.1");
assertRequestLineEquals(request, "DELETE http://endpoint/vapi-version/images/2 HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, null, null, false);
@ -153,7 +153,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("listServers", listOptionsVarargsClass);
HttpRequest request = processor.createRequest(method);
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -171,7 +171,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
HttpRequest request = processor.createRequest(method, changesSince(now).maxResults(1).startAt(2));
assertRequestLineEquals(request,
"GET http://endpoint/vapiversion/servers?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
"GET http://endpoint/vapi-version/servers?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -186,7 +186,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("listServers", listOptionsVarargsClass);
HttpRequest request = processor.createRequest(method, withDetails());
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/detail?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/detail?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -201,7 +201,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("getServer", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -216,7 +216,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("listFlavors", listOptionsVarargsClass);
HttpRequest request = processor.createRequest(method);
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -232,7 +232,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
HttpRequest request = processor.createRequest(method, changesSince(now).maxResults(1).startAt(2));
assertRequestLineEquals(request,
"GET http://endpoint/vapiversion/flavors?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
"GET http://endpoint/vapi-version/flavors?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -247,7 +247,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("listFlavors", listOptionsVarargsClass);
HttpRequest request = processor.createRequest(method, withDetails());
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors/detail?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors/detail?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -263,7 +263,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
HttpRequest request = processor.createRequest(method, withDetails().changesSince(now).maxResults(1).startAt(2));
assertRequestLineEquals(request,
"GET http://endpoint/vapiversion/flavors/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
"GET http://endpoint/vapi-version/flavors/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -278,7 +278,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("getFlavor", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors/2?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors/2?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -293,7 +293,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("listImages", listOptionsVarargsClass);
HttpRequest request = processor.createRequest(method);
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -308,7 +308,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("listImages", listOptionsVarargsClass);
HttpRequest request = processor.createRequest(method, withDetails());
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images/detail?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images/detail?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -324,7 +324,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
HttpRequest request = processor.createRequest(method, changesSince(now).maxResults(1).startAt(2));
assertRequestLineEquals(request,
"GET http://endpoint/vapiversion/images?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
"GET http://endpoint/vapi-version/images?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -340,7 +340,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
HttpRequest request = processor.createRequest(method, withDetails().changesSince(now).maxResults(1).startAt(2));
assertRequestLineEquals(request,
"GET http://endpoint/vapiversion/images/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
"GET http://endpoint/vapi-version/images/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -355,7 +355,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("getImage", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images/2?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images/2?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -370,7 +370,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("deleteServer", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "DELETE http://endpoint/vapiversion/servers/2 HTTP/1.1");
assertRequestLineEquals(request, "DELETE http://endpoint/vapi-version/servers/2 HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, null, null, false);
@ -385,7 +385,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("changeAdminPass", int.class, String.class);
HttpRequest request = processor.createRequest(method, 2, "foo");
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, "{\"changePassword\":{\"adminPass\":\"foo\"}}", MediaType.APPLICATION_JSON, false);
@ -401,7 +401,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("renameServer", int.class, String.class);
HttpRequest request = processor.createRequest(method, 2, "foo");
assertRequestLineEquals(request, "PUT http://endpoint/vapiversion/servers/2 HTTP/1.1");
assertRequestLineEquals(request, "PUT http://endpoint/vapi-version/servers/2 HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, "{\"server\":{\"name\":\"foo\"}}", MediaType.APPLICATION_JSON, false);
@ -417,7 +417,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("getAddresses", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2/ips?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2/ips?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -432,7 +432,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("listPublicAddresses", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2/ips/public?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2/ips/public?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -448,7 +448,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("listPrivateAddresses", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2/ips/private?format=json HTTP/1.1");
assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2/ips/private?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, null, null, false);
@ -464,7 +464,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("createImageFromServer", String.class, int.class);
HttpRequest request = processor.createRequest(method, "ralphie", 2);
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/images?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/images?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
assertPayloadEquals(request, "{\"image\":{\"serverId\":2,\"name\":\"ralphie\"}}", MediaType.APPLICATION_JSON,
false);
@ -486,7 +486,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
rebuildServerOptionsVarargsClass);
HttpRequest request = processor.createRequest(method, 3);
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/3/action?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/3/action?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, "{\"rebuild\":{}}", MediaType.APPLICATION_JSON, false);
@ -503,7 +503,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
rebuildServerOptionsVarargsClass);
HttpRequest request = processor.createRequest(method, 3, withImage("2"));
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/3/action?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/3/action?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, "{\"rebuild\":{\"imageRef\":\"2\"}}", MediaType.APPLICATION_JSON, false);
@ -519,7 +519,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("rebootServer", int.class, RebootType.class);
HttpRequest request = processor.createRequest(method, 2, RebootType.HARD);
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, "{\"reboot\":{\"type\":\"HARD\"}}", MediaType.APPLICATION_JSON, false);
@ -535,7 +535,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("resizeServer", int.class, int.class);
HttpRequest request = processor.createRequest(method, 2, 3);
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, "{\"resize\":{\"flavorId\":3}}", MediaType.APPLICATION_JSON, false);
@ -551,7 +551,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("confirmResizeServer", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, "{\"confirmResize\":null}", MediaType.APPLICATION_JSON, false);
@ -566,7 +566,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
Method method = NovaAsyncClient.class.getMethod("revertResizeServer", int.class);
HttpRequest request = processor.createRequest(method, 2);
assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1");
assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, "{\"revertResize\":null}", MediaType.APPLICATION_JSON, false);
@ -605,7 +605,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
@Override
protected URI provideServerUrl(AuthenticationResponse response) {
return URI.create("http://endpoint/vapiversion");
return URI.create("http://endpoint/vapi-version");
}
}
@ -620,7 +620,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
@Override
protected Properties getProperties() {
Properties overrides = new Properties();
overrides.setProperty(PROPERTY_API_VERSION, "apiversion");
overrides.setProperty(PROPERTY_API_VERSION, "api-version");
overrides.setProperty(provider + ".endpoint", "http://endpoint");
overrides.setProperty(provider + ".contextbuilder", NovaContextBuilder.class.getName());
return overrides;

2
apis/nova/src/test/java/org/jclouds/openstack/nova/live/PropertyHelper.java
View File

@ -60,7 +60,7 @@ public class PropertyHelper {
properties.setProperty(provider + ".identity", properties.getProperty("test." + provider + ".identity"));
properties.setProperty(provider + ".credential", properties.getProperty("test." + provider + ".credential"));
properties.setProperty(provider + ".endpoint", properties.getProperty("test." + provider + ".endpoint"));
properties.setProperty(provider + ".apiversion", properties.getProperty("test." + provider + ".apiversion"));
properties.setProperty(provider + ".api-version", properties.getProperty("test." + provider + ".api-version"));
properties.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
properties.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
return properties;

6
apis/s3/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.s3.blobstore.integration.S3TestInitializer</test.initializer>
<test.s3.endpoint>https://s3.amazonaws.com</test.s3.endpoint>
<test.s3.apiversion>2006-03-01</test.s3.apiversion>
<test.s3.api-version>2006-03-01</test.s3.api-version>
<test.s3.identity>${test.aws.identity}</test.s3.identity>
<test.s3.credential>${test.aws.credential}</test.s3.credential>
</properties>
@ -109,8 +109,8 @@
<value>${test.s3.endpoint}</value>
</property>
<property>
<name>test.s3.apiversion</name>
<value>${test.s3.apiversion}</value>
<name>test.s3.api-version</name>
<value>${test.s3.api-version}</value>
</property>
<property>
<name>test.s3.identity</name>

4
apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java
View File

@ -41,10 +41,10 @@ public class S3TestInitializer extends TransientBlobStoreTestInitializer {
}
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential));
}
}

6
apis/swift/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer</test.initializer>
<test.swift.endpoint>http://localhost:11000</test.swift.endpoint>
<test.swift.apiversion>1.0</test.swift.apiversion>
<test.swift.api-version>1.0</test.swift.api-version>
<test.swift.identity>test:tester</test.swift.identity>
<test.swift.credential>testing</test.swift.credential>
</properties>
@ -109,8 +109,8 @@
<value>${test.swift.endpoint}</value>
</property>
<property>
<name>test.swift.apiversion</name>
<value>${test.swift.apiversion}</value>
<name>test.swift.api-version</name>
<value>${test.swift.api-version}</value>
</property>
<property>
<name>test.swift.identity</name>

4
apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java
View File

@ -39,10 +39,10 @@ public class SwiftTestInitializer extends TransientBlobStoreTestInitializer {
}
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential));
}
}

6
apis/vcloud/pom.xml
View File

@ -37,7 +37,7 @@
<!-- when instances are hung, open a ticket and add here -->
<jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
<test.vcloud.endpoint>FIXME</test.vcloud.endpoint>
<test.vcloud.apiversion>1.0</test.vcloud.apiversion>
<test.vcloud.api-version>1.0</test.vcloud.api-version>
<test.vcloud.identity>FIXME</test.vcloud.identity>
<test.vcloud.credential>FIXME</test.vcloud.credential>
</properties>
@ -118,8 +118,8 @@
<value>${test.vcloud.endpoint}</value>
</property>
<property>
<name>test.vcloud.apiversion</name>
<value>${test.vcloud.apiversion}</value>
<name>test.vcloud.api-version</name>
<value>${test.vcloud.api-version}</value>
</property>
<property>
<name>test.vcloud.identity</name>

8
apis/vcloud/src/test/java/org/jclouds/vcloud/DeprecatedVCloudClientLiveTest.java
View File

@ -285,7 +285,7 @@ public class DeprecatedVCloudClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected Iterable<Org> orgs;
protected void setupCredentials() {
@ -293,7 +293,7 @@ public class DeprecatedVCloudClientLiveTest {
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".identity");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -304,8 +304,8 @@ public class DeprecatedVCloudClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

10
apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudClientLiveTest.java
View File

@ -53,7 +53,7 @@ public abstract class BaseVCloudClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected VCloudClient getVCloudApi() {
return VCloudClient.class.cast(client.getContext().getProviderSpecificContext().getApi());
@ -64,7 +64,7 @@ public abstract class BaseVCloudClientLiveTest {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -76,8 +76,8 @@ public abstract class BaseVCloudClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}
@ -101,4 +101,4 @@ public abstract class BaseVCloudClientLiveTest {
protected void cleanup() throws InterruptedException, ExecutionException, TimeoutException {
client.getContext().close();
}
}
}

6
apis/walrus/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.walrus.blobstore.WalrusTestInitializer</test.initializer>
<test.walrus.endpoint>http://ecc.eucalyptus.com:8773/services/Walrus</test.walrus.endpoint>
<test.walrus.apiversion>2006-03-01</test.walrus.apiversion>
<test.walrus.api-version>2006-03-01</test.walrus.api-version>
<test.walrus.identity>${test.eucalyptus.identity}</test.walrus.identity>
<test.walrus.credential>${test.eucalyptus.credential}</test.walrus.credential>
</properties>
@ -105,8 +105,8 @@
<value>${test.walrus.endpoint}</value>
</property>
<property>
<name>test.walrus.apiversion</name>
<value>${test.walrus.apiversion}</value>
<name>test.walrus.api-version</name>
<value>${test.walrus.api-version}</value>
</property>
<property>
<name>test.walrus.identity</name>

6
archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml
View File

@ -58,7 +58,7 @@ $symbol_dollar = '$' )
<properties>
<test.${lcaseProviderName}.identity>${providerIdentity}</test.${lcaseProviderName}.identity>
<test.${lcaseProviderName}.credential>${providerCredential}</test.${lcaseProviderName}.credential>
<test.${lcaseProviderName}.apiversion>${providerApiVersion}</test.${lcaseProviderName}.apiversion>
<test.${lcaseProviderName}.api-version>${providerApiVersion}</test.${lcaseProviderName}.api-version>
<test.${lcaseProviderName}.endpoint>${providerEndpoint}</test.${lcaseProviderName}.endpoint>
</properties>
<dependencies>
@ -117,8 +117,8 @@ $symbol_dollar = '$' )
<value>\$\{test.${lcaseProviderName}.endpoint\}</value>
</property>
<property>
<name>test.${lcaseProviderName}.apiversion</name>
<value>\$\{test.${lcaseProviderName}.apiversion\}</value>
<name>test.${lcaseProviderName}.api-version</name>
<value>\$\{test.${lcaseProviderName}.api-version\}</value>
</property>
</systemProperties>
</configuration>

2
archetypes/rest-client-archetype/src/main/resources/archetype-resources/src/test/java/__providerName__ClientLiveTest.java
View File

@ -55,7 +55,7 @@ public class ${providerName}ClientLiveTest {
identity = checkNotNull(System.getProperty("test.${lcaseProviderName}.identity"), "test.${lcaseProviderName}.identity");
credential = checkNotNull(System.getProperty("test.${lcaseProviderName}.credential"), "test.${lcaseProviderName}.credential");
endpoint = checkNotNull(System.getProperty("test.${lcaseProviderName}.endpoint"), "test.${lcaseProviderName}.endpoint");
apiVersion = checkNotNull(System.getProperty("test.${lcaseProviderName}.apiversion"), "test.${lcaseProviderName}.apiversion");
apiVersion = checkNotNull(System.getProperty("test.${lcaseProviderName}.api-version"), "test.${lcaseProviderName}.api-version");
}
@BeforeGroups(groups = { "live" })

4
blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java
View File

@ -32,10 +32,10 @@ import com.google.inject.Module;
public class TransientBlobStoreTestInitializer extends BaseTestInitializer {
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String url, String apiversion, String app,
protected BlobStoreContext createLiveContext(Module configurationModule, String url, String apiVersion, String app,
String identity, String key) throws IOException {
return createStubContext();
}
}
}

16
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java
View File

@ -37,7 +37,7 @@ public abstract class BaseTestInitializer {
String app = System.getProperty("test.app");
String identity = System.getProperty("test." + provider + ".identity");
String credential = System.getProperty("test." + provider + ".credential");
String apiversion = System.getProperty("test." + provider + ".apiversion");
String apiVersion = System.getProperty("test." + provider + ".api-version");
if (endpoint != null)
testContext.setAttribute("test." + provider + ".endpoint", endpoint);
if (app != null)
@ -47,15 +47,15 @@ public abstract class BaseTestInitializer {
if (credential != null)
testContext.setAttribute("test." + provider + ".credential", credential);
if (credential != null)
testContext.setAttribute("test." + provider + ".apiversion", apiversion);
testContext.setAttribute("test." + provider + ".api-version", apiVersion);
if (identity != null) {
return createLiveContext(configurationModule, endpoint, apiversion, app, identity, credential);
return createLiveContext(configurationModule, endpoint, apiVersion, app, identity, credential);
} else {
return createStubContext();
}
}
protected Properties setupProperties(String endpoint, String apiversion, String identity, String credential) {
protected Properties setupProperties(String endpoint, String apiVersion, String identity, String credential) {
Properties overrides = new Properties();
overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
@ -65,8 +65,8 @@ public abstract class BaseTestInitializer {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}
@ -74,6 +74,6 @@ public abstract class BaseTestInitializer {
return new BlobStoreContextFactory().createContext("transient", "foo", "bar");
}
protected abstract BlobStoreContext createLiveContext(Module configurationModule, String url, String apiversion,
protected abstract BlobStoreContext createLiveContext(Module configurationModule, String url, String apiVersion,
String app, String identity, String key) throws IOException;
}
}

10
common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/TerremarkClientLiveTest.java
View File

@ -461,7 +461,7 @@ public abstract class TerremarkClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
@BeforeGroups(groups = { "live" })
public void setupClient() {
@ -725,7 +725,7 @@ public abstract class TerremarkClientLiveTest {
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".identity");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -736,8 +736,8 @@ public abstract class TerremarkClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}
@ -820,4 +820,4 @@ public abstract class TerremarkClientLiveTest {
}
}
}
}
}

8
common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/suppliers/VAppTemplatesInOrgsLiveTest.java
View File

@ -59,15 +59,15 @@ public class VAppTemplatesInOrgsLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
+ ".apiversion");
apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
+ ".api-version");
}
protected Properties setupProperties() {
@ -77,7 +77,7 @@ public class VAppTemplatesInOrgsLiveTest {
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".credential", credential);
overrides.setProperty(provider + ".endpoint", endpoint);
overrides.setProperty(provider + ".apiversion", apiversion);
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

10
common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/BaseTerremarkClientLiveTest.java
View File

@ -59,7 +59,7 @@ public abstract class BaseTerremarkClientLiveTest <T extends TerremarkVCloudClie
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected RetryablePredicate<IPSocket> socketTester;
protected Factory sshFactory;
@ -74,7 +74,7 @@ public abstract class BaseTerremarkClientLiveTest <T extends TerremarkVCloudClie
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -86,8 +86,8 @@ public abstract class BaseTerremarkClientLiveTest <T extends TerremarkVCloudClie
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}
@ -113,4 +113,4 @@ public abstract class BaseTerremarkClientLiveTest <T extends TerremarkVCloudClie
protected void cleanup() throws InterruptedException, ExecutionException, TimeoutException {
client.getContext().close();
}
}
}

8
compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
View File

@ -127,7 +127,7 @@ public abstract class BaseComputeServiceLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected Properties setupProperties() {
Properties overrides = new Properties();
@ -138,8 +138,8 @@ public abstract class BaseComputeServiceLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}
@ -165,7 +165,7 @@ public abstract class BaseComputeServiceLiveTest {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected void setupKeyPairForTest() throws FileNotFoundException, IOException {

10
compute/src/test/java/org/jclouds/compute/BaseTemplateBuilderLiveTest.java
View File

@ -68,14 +68,14 @@ public abstract class BaseTemplateBuilderLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected ComputeServiceContext context;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
public void testCompareSizes() throws Exception {
@ -116,8 +116,8 @@ public abstract class BaseTemplateBuilderLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}
@ -263,4 +263,4 @@ public abstract class BaseTemplateBuilderLiveTest {
context.close();
}
}
}

4
core/src/main/java/org/jclouds/rest/RestContextFactory.java
View File

@ -240,7 +240,7 @@ public class RestContextFactory {
Properties props = new Properties();
props.setProperty(contextSpec.provider + ".endpoint", contextSpec.endpoint);
props.setProperty(contextSpec.provider + ".apiversion", contextSpec.apiVersion);
props.setProperty(contextSpec.provider + ".api-version", contextSpec.apiVersion);
props.setProperty(contextSpec.provider + "." + LocationConstants.ISO3166_CODES, contextSpec.iso3166Codes);
props.setProperty(contextSpec.provider + ".identity", contextSpec.identity);
if (contextSpec.credential != null)
@ -288,7 +288,7 @@ public class RestContextFactory {
String endpoint = props.getProperty(providerName + "." + LocationConstants.ENDPOINT, null);
String iso3166Codes = props.getProperty(providerName + "." + LocationConstants.ISO3166_CODES, null);
String apiVersion = props.getProperty(providerName + ".apiversion", null);
String apiVersion = props.getProperty(providerName + ".api-version", null);
identity = props.getProperty(providerName + ".identity", props.getProperty("jclouds.identity", identity));
credential = loadCredentialOrDefault(props, providerName + ".credential",
loadCredentialOrDefault(props, "jclouds.credential", credential));

6
core/src/main/resources/rest.properties
View File

@ -4,7 +4,7 @@ byon.propertiesbuilder=org.jclouds.byon.BYONPropertiesBuilder
azurequeue.contextbuilder=org.jclouds.azure.storage.AzureStorageContextBuilder
azurequeue.sync=org.jclouds.azurequeue.AzureQueueClient
azurequeue.async=org.jclouds.azurequeue.AzureQueueAsyncClient
azurequeue.apiversion=2009-09-19
azurequeue.api-version=2009-09-19
azurequeue.propertiesbuilder=org.jclouds.azure.storage.AzureStoragePropertiesBuilder
azurequeue.endpoint=https://{identity}.queue.core.windows.net
@ -94,7 +94,7 @@ deltacloud.contextbuilder=org.jclouds.deltacloud.DeltacloudContextBuilder
elasticstack.propertiesbuilder=org.jclouds.elasticstack.ElasticStackPropertiesBuilder
elasticstack.contextbuilder=org.jclouds.elasticstack.ElasticStackContextBuilder
elasticstack.apiversion=1.0
elasticstack.api-version=1.0
elastichosts-lon-p.propertiesbuilder=org.jclouds.elastichosts.ElasticHostsPeer1LondonPropertiesBuilder
elastichosts-lon-p.contextbuilder=org.jclouds.elasticstack.ElasticStackContextBuilder
@ -141,7 +141,7 @@ stub.contextbuilder=org.jclouds.compute.stub.StubComputeServiceContextBuilder
atmos.contextbuilder=org.jclouds.atmos.AtmosContextBuilder
atmos.endpoint=https://accesspoint.atmosonline.com
atmos.apiversion=1.3.0
atmos.api-version=1.3.0
synaptic-storage.contextbuilder=org.jclouds.atmos.AtmosContextBuilder
synaptic-storage.propertiesbuilder=org.jclouds.synaptic.storage.SynapticStoragePropertiesBuilder

14
core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java
View File

@ -66,7 +66,7 @@ public class RestContextFactoryTest {
Properties props = RestContextFactory.toProperties(contextSpec);
assertEquals(props.getProperty("test.endpoint"), "http://localhost");
assertEquals(props.getProperty("test.apiversion"), "1");
assertEquals(props.getProperty("test.api-version"), "1");
assertEquals(props.getProperty("test.identity"), "dummy");
assertEquals(props.getProperty("test.iso3166-codes"), "US-CA");
assertEquals(props.getProperty("test.credential"), null);
@ -86,7 +86,7 @@ public class RestContextFactoryTest {
Properties props = RestContextFactory.toProperties(contextSpec);
assertEquals(props.getProperty("test.endpoint"), "http://localhost");
assertEquals(props.getProperty("test.apiversion"), "1");
assertEquals(props.getProperty("test.api-version"), "1");
assertEquals(props.getProperty("test.identity"), "dummy");
assertEquals(props.getProperty("test.credential"), "credential");
assertEquals(props.getProperty("test.sync"), IntegrationTestClient.class.getName());
@ -107,7 +107,7 @@ public class RestContextFactoryTest {
Properties props = RestContextFactory.toProperties(contextSpec);
assertEquals(props.getProperty("test.endpoint"), "http://localhost");
assertEquals(props.getProperty("test.apiversion"), "1");
assertEquals(props.getProperty("test.api-version"), "1");
assertEquals(props.getProperty("test.identity"), "dummy");
assertEquals(props.getProperty("test.credential"), null);
assertEquals(props.getProperty("test.sync"), null);
@ -128,7 +128,7 @@ public class RestContextFactoryTest {
Properties props = RestContextFactory.toProperties(contextSpec);
assertEquals(props.getProperty("test.endpoint"), "http://localhost");
assertEquals(props.getProperty("test.apiversion"), "1");
assertEquals(props.getProperty("test.api-version"), "1");
assertEquals(props.getProperty("test.identity"), "dummy");
assertEquals(props.getProperty("test.credential"), null);
assertEquals(props.getProperty("test.sync"), null);
@ -149,7 +149,7 @@ public class RestContextFactoryTest {
Properties props = RestContextFactory.toProperties(contextSpec);
assertEquals(props.getProperty("test.endpoint"), "http://localhost");
assertEquals(props.getProperty("test.apiversion"), "1");
assertEquals(props.getProperty("test.api-version"), "1");
assertEquals(props.getProperty("test.identity"), "dummy");
assertEquals(props.getProperty("test.credential"), null);
assertEquals(props.getProperty("test.sync"), null);
@ -165,7 +165,7 @@ public class RestContextFactoryTest {
public void testBuilderPropertiesJCloudsScope() {
Properties props = new Properties();
props.setProperty("test.endpoint", "http://localhost");
props.setProperty("test.apiversion", "1");
props.setProperty("test.api-version", "1");
props.setProperty("test.iso3166-codes", "US");
props.setProperty("jclouds.identity", "foo");
props.setProperty("jclouds.credential", "bar");
@ -200,7 +200,7 @@ public class RestContextFactoryTest {
Files.write("bar", file, Charsets.UTF_8);
Properties props = new Properties();
props.setProperty("test.endpoint", "http://localhost");
props.setProperty("test.apiversion", "1");
props.setProperty("test.api-version", "1");
props.setProperty("test.iso3166-codes", "US");
props.setProperty("test.identity", "foo");
props.setProperty("test.credential.file", file.getAbsolutePath());

12
loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java
View File

@ -71,7 +71,7 @@ public abstract class BaseLoadBalancerServiceLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected LoadBalancerServiceContext context;
protected String computeProvider;
@ -85,13 +85,13 @@ public abstract class BaseLoadBalancerServiceLiveTest {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
computeProvider = checkNotNull(System.getProperty("test." + provider + ".compute.provider"), "test." + provider
+ ".compute.provider");
computeIdentity = checkNotNull(System.getProperty("test." + provider + ".compute.identity"), "test." + provider + ".compute.identity");
computeCredential = System.getProperty("test." + provider + ".compute.credential");
computeEndpoint = System.getProperty("test." + provider + ".compute.endpoint");
computeApiversion = System.getProperty("test." + provider + ".compute.apiversion");
computeApiversion = System.getProperty("test." + provider + ".compute.api-version");
}
protected Properties setupProperties() {
@ -103,8 +103,8 @@ public abstract class BaseLoadBalancerServiceLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}
@ -118,7 +118,7 @@ public abstract class BaseLoadBalancerServiceLiveTest {
if (computeEndpoint != null)
overrides.setProperty(computeProvider + ".endpoint", computeEndpoint);
if (computeApiversion != null)
overrides.setProperty(computeProvider + ".apiversion", computeApiversion);
overrides.setProperty(computeProvider + ".api-version", computeApiversion);
return overrides;
}

10
providers/aws-cloudwatch/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.aws-cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.aws-cloudwatch.endpoint>
<test.aws-cloudwatch.apiversion>2009-05-15</test.aws-cloudwatch.apiversion>
<test.aws-cloudwatch.api-version>2009-05-15</test.aws-cloudwatch.api-version>
<test.aws-cloudwatch.identity>${test.aws.identity}</test.aws-cloudwatch.identity>
<test.aws-cloudwatch.credential>${test.aws.credential}</test.aws-cloudwatch.credential>
</properties>
@ -91,8 +91,8 @@
<value>${test.aws-cloudwatch.endpoint}</value>
</property>
<property>
<name>test.aws-cloudwatch.apiversion</name>
<value>${test.aws-cloudwatch.apiversion}</value>
<name>test.aws-cloudwatch.api-version</name>
<value>${test.aws-cloudwatch.api-version}</value>
</property>
<property>
<name>test.aws-cloudwatch.identity</name>
@ -111,8 +111,8 @@
<value>${test.aws-cloudwatch.compute.endpoint}</value>
</property>
<property>
<name>test.aws-cloudwatch.compute.apiversion</name>
<value>${test.aws-cloudwatch.compute.apiversion}</value>
<name>test.aws-cloudwatch.compute.api-version</name>
<value>${test.aws-cloudwatch.compute.api-version}</value>
</property>
<property>
<name>test.aws-cloudwatch.compute.identity</name>

6
providers/aws-ec2/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.aws-ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.aws-ec2.endpoint>
<test.aws-ec2.apiversion>2011-05-15</test.aws-ec2.apiversion>
<test.aws-ec2.api-version>2011-05-15</test.aws-ec2.api-version>
<test.aws-ec2.identity>${test.aws.identity}</test.aws-ec2.identity>
<test.aws-ec2.credential>${test.aws.credential}</test.aws-ec2.credential>
</properties>
@ -114,8 +114,8 @@
<value>${test.aws-ec2.endpoint}</value>
</property>
<property>
<name>test.aws-ec2.apiversion</name>
<value>${test.aws-ec2.apiversion}</value>
<name>test.aws-ec2.api-version</name>
<value>${test.aws-ec2.api-version}</value>
</property>
<property>
<name>test.aws-ec2.identity</name>

8
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java
View File

@ -73,14 +73,14 @@ public class AMIClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
@BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -92,8 +92,8 @@ public class AMIClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSAMIClientLiveTest.java
View File

@ -70,14 +70,14 @@ public class AWSAMIClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
@BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -89,8 +89,8 @@ public class AWSAMIClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSInstanceClientLiveTest.java
View File

@ -54,14 +54,14 @@ public class AWSInstanceClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -72,8 +72,8 @@ public class AWSInstanceClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSKeyPairClientLiveTest.java
View File

@ -75,7 +75,7 @@ public class AWSKeyPairClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
private ComputeServiceContext computeContext;
protected void setupCredentials() {
@ -83,7 +83,7 @@ public class AWSKeyPairClientLiveTest {
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint", null);
apiversion = System.getProperty("test." + provider + ".apiversion", null);
apiVersion = System.getProperty("test." + provider + ".api-version", null);
}
protected Properties setupProperties() {
@ -94,8 +94,8 @@ public class AWSKeyPairClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/MonitoringClientLiveTest.java
View File

@ -52,15 +52,15 @@ public class MonitoringClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
+ ".apiversion");
apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
+ ".api-version");
}
protected Properties setupProperties() {
@ -70,7 +70,7 @@ public class MonitoringClientLiveTest {
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".credential", credential);
overrides.setProperty(provider + ".endpoint", endpoint);
overrides.setProperty(provider + ".apiversion", apiversion);
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java
View File

@ -79,14 +79,14 @@ public class PlacementGroupClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
@BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -98,8 +98,8 @@ public class PlacementGroupClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java
View File

@ -74,7 +74,7 @@ public class SpotInstanceClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
private AWSRunningInstance instance;
private long start;
@ -83,7 +83,7 @@ public class SpotInstanceClientLiveTest {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -95,8 +95,8 @@ public class SpotInstanceClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java
View File

@ -64,7 +64,7 @@ public class TagClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected String testGroup;
private ComputeServiceContext computeContext;
@ -72,7 +72,7 @@ public class TagClientLiveTest {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint", null);
apiversion = System.getProperty("test." + provider + ".apiversion", null);
apiVersion = System.getProperty("test." + provider + ".api-version", null);
}
protected Properties setupProperties() {
@ -83,8 +83,8 @@ public class TagClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
providers/aws-s3/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.aws.s3.blobstore.integration.AWSS3TestInitializer</test.initializer>
<test.aws-s3.endpoint>https://s3.amazonaws.com</test.aws-s3.endpoint>
<test.aws-s3.apiversion>2006-03-01</test.aws-s3.apiversion>
<test.aws-s3.api-version>2006-03-01</test.aws-s3.api-version>
<test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity>
<test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential>
<test.blobstore.container-count>25</test.blobstore.container-count>
@ -127,8 +127,8 @@
<value>${test.aws-s3.endpoint}</value>
</property>
<property>
<name>test.aws-s3.apiversion</name>
<value>${test.aws-s3.apiversion}</value>
<name>test.aws-s3.api-version</name>
<value>${test.aws-s3.api-version}</value>
</property>
<property>
<name>test.aws-s3.identity</name>

4
providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java
View File

@ -42,10 +42,10 @@ public class AWSS3TestInitializer extends TransientBlobStoreTestInitializer {
}
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule(), new EnterpriseConfigurationModule()), setupProperties(endpoint, apiversion,
new Log4JLoggingModule(), new EnterpriseConfigurationModule()), setupProperties(endpoint, apiVersion,
identity, credential));
}

6
providers/azureblob/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.azureblob.blobstore.integration.AzureBlobTestInitializer</test.initializer>
<test.azureblob.endpoint>https://{identity}.blob.core.windows.net</test.azureblob.endpoint>
<test.azureblob.apiversion>2009-09-19</test.azureblob.apiversion>
<test.azureblob.api-version>2009-09-19</test.azureblob.api-version>
<test.azureblob.identity>${test.azure.identity}</test.azureblob.identity>
<test.azureblob.credential>${test.azure.credential}</test.azureblob.credential>
</properties>
@ -104,8 +104,8 @@
<value>${test.azureblob.endpoint}</value>
</property>
<property>
<name>test.azureblob.apiversion</name>
<value>${test.azureblob.apiversion}</value>
<name>test.azureblob.api-version</name>
<value>${test.azureblob.api-version}</value>
</property>
<property>
<name>test.azureblob.identity</name>

8
providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java
View File

@ -77,13 +77,13 @@ public class AzureBlobClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -95,8 +95,8 @@ public class AzureBlobClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

4
providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java
View File

@ -39,10 +39,10 @@ public class AzureBlobTestInitializer extends TransientBlobStoreTestInitializer
}
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential));
}
}

6
providers/bluelock-vcloud-zone01/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.bluelock-vcloud-zone01.endpoint>https://zone01.bluelock.com/api</test.bluelock-vcloud-zone01.endpoint>
<test.bluelock-vcloud-zone01.apiversion>1.0</test.bluelock-vcloud-zone01.apiversion>
<test.bluelock-vcloud-zone01.api-version>1.0</test.bluelock-vcloud-zone01.api-version>
<test.bluelock-vcloud-zone01.identity>FIXME_IDENTITY</test.bluelock-vcloud-zone01.identity>
<test.bluelock-vcloud-zone01.credential>FIXME_CREDENTIAL</test.bluelock-vcloud-zone01.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.bluelock-vcloud-zone01.endpoint}</value>
</property>
<property>
<name>test.bluelock-vcloud-zone01.apiversion</name>
<value>${test.bluelock-vcloud-zone01.apiversion}</value>
<name>test.bluelock-vcloud-zone01.api-version</name>
<value>${test.bluelock-vcloud-zone01.api-version}</value>
</property>
<property>
<name>test.bluelock-vcloud-zone01.identity</name>

6
providers/cloudfiles-uk/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUKTestInitializer</test.initializer>
<test.cloudfiles-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudfiles-uk.endpoint>
<test.cloudfiles-uk.apiversion>1.0</test.cloudfiles-uk.apiversion>
<test.cloudfiles-uk.api-version>1.0</test.cloudfiles-uk.api-version>
<test.cloudfiles-uk.identity>${test.rackspace-uk.identity}</test.cloudfiles-uk.identity>
<test.cloudfiles-uk.credential>${test.rackspace-uk.credential}</test.cloudfiles-uk.credential>
</properties>
@ -113,8 +113,8 @@
<value>${test.cloudfiles-uk.endpoint}</value>
</property>
<property>
<name>test.cloudfiles-uk.apiversion</name>
<value>${test.cloudfiles-uk.apiversion}</value>
<name>test.cloudfiles-uk.api-version</name>
<value>${test.cloudfiles-uk.api-version}</value>
</property>
<property>
<name>test.cloudfiles-uk.identity</name>

6
providers/cloudfiles-us/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUSTestInitializer</test.initializer>
<test.cloudfiles-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles-us.endpoint>
<test.cloudfiles-us.apiversion>1.0</test.cloudfiles-us.apiversion>
<test.cloudfiles-us.api-version>1.0</test.cloudfiles-us.api-version>
<test.cloudfiles-us.identity>${test.rackspace-us.identity}</test.cloudfiles-us.identity>
<test.cloudfiles-us.credential>${test.rackspace-us.credential}</test.cloudfiles-us.credential>
</properties>
@ -113,8 +113,8 @@
<value>${test.cloudfiles-us.endpoint}</value>
</property>
<property>
<name>test.cloudfiles-us.apiversion</name>
<value>${test.cloudfiles-us.apiversion}</value>
<name>test.cloudfiles-us.api-version</name>
<value>${test.cloudfiles-us.api-version}</value>
</property>
<property>
<name>test.cloudfiles-us.identity</name>

6
providers/cloudloadbalancers-us/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.cloudloadbalancers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers-us.endpoint>
<test.cloudloadbalancers-us.apiversion>1.0</test.cloudloadbalancers-us.apiversion>
<test.cloudloadbalancers-us.api-version>1.0</test.cloudloadbalancers-us.api-version>
<test.cloudloadbalancers-us.identity>${test.rackspace-us.identity}</test.cloudloadbalancers-us.identity>
<test.cloudloadbalancers-us.credential>${test.rackspace-us.credential}</test.cloudloadbalancers-us.credential>
</properties>
@ -100,8 +100,8 @@
<value>${test.cloudloadbalancers-us.endpoint}</value>
</property>
<property>
<name>test.cloudloadbalancers-us.apiversion</name>
<value>${test.cloudloadbalancers-us.apiversion}</value>
<name>test.cloudloadbalancers-us.api-version</name>
<value>${test.cloudloadbalancers-us.api-version}</value>
</property>
<property>
<name>test.cloudloadbalancers-us.identity</name>

8
providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java
View File

@ -56,7 +56,7 @@ public class BaseCloudLoadBalancersClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected Predicate<IPSocket> socketTester;
protected RetryablePredicate<LoadBalancer> loadBalancerActive;
protected RetryablePredicate<LoadBalancer> loadBalancerDeleted;
@ -69,7 +69,7 @@ public class BaseCloudLoadBalancersClientLiveTest {
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential must be set. ex. secretKey");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -80,8 +80,8 @@ public class BaseCloudLoadBalancersClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
providers/cloudonestorage/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.cloudonestorage.blobstore.integration.CloudOneStorageTestInitializer</test.initializer>
<test.cloudonestorage.endpoint>https://cloudonestorage.peer1.com</test.cloudonestorage.endpoint>
<test.cloudonestorage.apiversion>1.3.0</test.cloudonestorage.apiversion>
<test.cloudonestorage.api-version>1.3.0</test.cloudonestorage.api-version>
<test.cloudonestorage.identity>FIXME_IDENTITY</test.cloudonestorage.identity>
<test.cloudonestorage.credential>FIXME_CREDENTIAL</test.cloudonestorage.credential>
</properties>
@ -106,8 +106,8 @@
<value>${test.cloudonestorage.endpoint}</value>
</property>
<property>
<name>test.cloudonestorage.apiversion</name>
<value>${test.cloudonestorage.apiversion}</value>
<name>test.cloudonestorage.api-version</name>
<value>${test.cloudonestorage.api-version}</value>
</property>
<property>
<name>test.cloudonestorage.identity</name>

6
providers/cloudservers-uk/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.cloudservers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudservers-uk.endpoint>
<test.cloudservers-uk.apiversion>1.0</test.cloudservers-uk.apiversion>
<test.cloudservers-uk.api-version>1.0</test.cloudservers-uk.api-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>
</properties>
@ -108,8 +108,8 @@
<value>${test.cloudservers-uk.endpoint}</value>
</property>
<property>
<name>test.cloudservers-uk.apiversion</name>
<value>${test.cloudservers-uk.apiversion}</value>
<name>test.cloudservers-uk.api-version</name>
<value>${test.cloudservers-uk.api-version}</value>
</property>
<property>
<name>test.cloudservers-uk.identity</name>

6
providers/cloudservers-us/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.cloudservers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers-us.endpoint>
<test.cloudservers-us.apiversion>1.0</test.cloudservers-us.apiversion>
<test.cloudservers-us.api-version>1.0</test.cloudservers-us.api-version>
<test.cloudservers-us.identity>${test.rackspace-us.identity}</test.cloudservers-us.identity>
<test.cloudservers-us.credential>${test.rackspace-us.credential}</test.cloudservers-us.credential>
</properties>
@ -109,8 +109,8 @@
<value>${test.cloudservers-us.endpoint}</value>
</property>
<property>
<name>test.cloudservers-us.apiversion</name>
<value>${test.cloudservers-us.apiversion}</value>
<name>test.cloudservers-us.api-version</name>
<value>${test.cloudservers-us.api-version}</value>
</property>
<property>
<name>test.cloudservers-us.identity</name>

6
providers/cloudsigma-lvs/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.cloudsigma-lvs.endpoint>https://api.lvs.cloudsigma.com</test.cloudsigma-lvs.endpoint>
<test.cloudsigma-lvs.apiversion>1.0</test.cloudsigma-lvs.apiversion>
<test.cloudsigma-lvs.api-version>1.0</test.cloudsigma-lvs.api-version>
<test.cloudsigma-lvs.identity>FIXME</test.cloudsigma-lvs.identity>
<test.cloudsigma-lvs.credential>FIXME</test.cloudsigma-lvs.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.cloudsigma-lvs.endpoint}</value>
</property>
<property>
<name>test.cloudsigma-lvs.apiversion</name>
<value>${test.cloudsigma-lvs.apiversion}</value>
<name>test.cloudsigma-lvs.api-version</name>
<value>${test.cloudsigma-lvs.api-version}</value>
</property>
<property>
<name>test.cloudsigma-lvs.identity</name>

6
providers/cloudsigma-zrh/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.cloudsigma-zrh.endpoint>https://api.cloudsigma.com</test.cloudsigma-zrh.endpoint>
<test.cloudsigma-zrh.apiversion>1.0</test.cloudsigma-zrh.apiversion>
<test.cloudsigma-zrh.api-version>1.0</test.cloudsigma-zrh.api-version>
<test.cloudsigma-zrh.identity>FIXME</test.cloudsigma-zrh.identity>
<test.cloudsigma-zrh.credential>FIXME</test.cloudsigma-zrh.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.cloudsigma-zrh.endpoint}</value>
</property>
<property>
<name>test.cloudsigma-zrh.apiversion</name>
<value>${test.cloudsigma-zrh.apiversion}</value>
<name>test.cloudsigma-zrh.api-version</name>
<value>${test.cloudsigma-zrh.api-version}</value>
</property>
<property>
<name>test.cloudsigma-zrh.identity</name>

6
providers/elastichosts-lon-b/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.elastichosts-lon-b.endpoint>https://api.lon-b.elastichosts.com</test.elastichosts-lon-b.endpoint>
<test.elastichosts-lon-b.apiversion>2.0</test.elastichosts-lon-b.apiversion>
<test.elastichosts-lon-b.api-version>2.0</test.elastichosts-lon-b.api-version>
<test.elastichosts-lon-b.identity>FIXME_IDENTITY</test.elastichosts-lon-b.identity>
<test.elastichosts-lon-b.credential>FIXME_CREDENTIAL</test.elastichosts-lon-b.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.elastichosts-lon-b.endpoint}</value>
</property>
<property>
<name>test.elastichosts-lon-b.apiversion</name>
<value>${test.elastichosts-lon-b.apiversion}</value>
<name>test.elastichosts-lon-b.api-version</name>
<value>${test.elastichosts-lon-b.api-version}</value>
</property>
<property>
<name>test.elastichosts-lon-b.identity</name>

6
providers/elastichosts-lon-p/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.elastichosts-lon-p.endpoint>https://api.lon-p.elastichosts.com</test.elastichosts-lon-p.endpoint>
<test.elastichosts-lon-p.apiversion>2.0</test.elastichosts-lon-p.apiversion>
<test.elastichosts-lon-p.api-version>2.0</test.elastichosts-lon-p.api-version>
<test.elastichosts-lon-p.identity>FIXME_IDENTITY</test.elastichosts-lon-p.identity>
<test.elastichosts-lon-p.credential>FIXME_CREDENTIAL</test.elastichosts-lon-p.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.elastichosts-lon-p.endpoint}</value>
</property>
<property>
<name>test.elastichosts-lon-p.apiversion</name>
<value>${test.elastichosts-lon-p.apiversion}</value>
<name>test.elastichosts-lon-p.api-version</name>
<value>${test.elastichosts-lon-p.api-version}</value>
</property>
<property>
<name>test.elastichosts-lon-p.identity</name>

6
providers/elastichosts-sat-p/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.elastichosts-sat-p.endpoint>https://api.sat-p.elastichosts.com</test.elastichosts-sat-p.endpoint>
<test.elastichosts-sat-p.apiversion>2.0</test.elastichosts-sat-p.apiversion>
<test.elastichosts-sat-p.api-version>2.0</test.elastichosts-sat-p.api-version>
<test.elastichosts-sat-p.identity>FIXME_IDENTITY</test.elastichosts-sat-p.identity>
<test.elastichosts-sat-p.credential>FIXME_CREDENTIAL</test.elastichosts-sat-p.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.elastichosts-sat-p.endpoint}</value>
</property>
<property>
<name>test.elastichosts-sat-p.apiversion</name>
<value>${test.elastichosts-sat-p.apiversion}</value>
<name>test.elastichosts-sat-p.api-version</name>
<value>${test.elastichosts-sat-p.api-version}</value>
</property>
<property>
<name>test.elastichosts-sat-p.identity</name>

6
providers/eucalyptus-partnercloud-ec2/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.eucalyptus-partnercloud-ec2.endpoint>http://partnercloud.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus-partnercloud-ec2.endpoint>
<test.eucalyptus-partnercloud-ec2.apiversion>2010-06-15</test.eucalyptus-partnercloud-ec2.apiversion>
<test.eucalyptus-partnercloud-ec2.api-version>2010-06-15</test.eucalyptus-partnercloud-ec2.api-version>
<test.eucalyptus-partnercloud-ec2.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-ec2.identity>
<test.eucalyptus-partnercloud-ec2.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-ec2.credential>
<!-- corresponds to image manifest and also virt + "-cluster" zone -->
@ -118,8 +118,8 @@
<value>${test.eucalyptus-partnercloud-ec2.endpoint}</value>
</property>
<property>
<name>test.eucalyptus-partnercloud-ec2.apiversion</name>
<value>${test.eucalyptus-partnercloud-ec2.apiversion}</value>
<name>test.eucalyptus-partnercloud-ec2.api-version</name>
<value>${test.eucalyptus-partnercloud-ec2.api-version}</value>
</property>
<property>
<name>test.eucalyptus-partnercloud-ec2.identity</name>

6
providers/eucalyptus-partnercloud-s3/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer</test.initializer>
<test.eucalyptus-partnercloud-s3.endpoint>http://partnercloud.eucalyptus.com:8773/services/Walrus</test.eucalyptus-partnercloud-s3.endpoint>
<test.eucalyptus-partnercloud-s3.apiversion>2006-03-01</test.eucalyptus-partnercloud-s3.apiversion>
<test.eucalyptus-partnercloud-s3.api-version>2006-03-01</test.eucalyptus-partnercloud-s3.api-version>
<test.eucalyptus-partnercloud-s3.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-s3.identity>
<test.eucalyptus-partnercloud-s3.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-s3.credential>
<test.blobstore.container-count>15</test.blobstore.container-count>
@ -114,8 +114,8 @@
<value>${test.eucalyptus-partnercloud-s3.endpoint}</value>
</property>
<property>
<name>test.eucalyptus-partnercloud-s3.apiversion</name>
<value>${test.eucalyptus-partnercloud-s3.apiversion}</value>
<name>test.eucalyptus-partnercloud-s3.api-version</name>
<value>${test.eucalyptus-partnercloud-s3.api-version}</value>
</property>
<property>
<name>test.eucalyptus-partnercloud-s3.identity</name>

6
providers/go2cloud-jhb1/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.go2cloud-jhb1.endpoint>http://api.jhb1.go2cloud.co.za</test.go2cloud-jhb1.endpoint>
<test.go2cloud-jhb1.apiversion>2.0</test.go2cloud-jhb1.apiversion>
<test.go2cloud-jhb1.api-version>2.0</test.go2cloud-jhb1.api-version>
<test.go2cloud-jhb1.identity>FIXME_IDENTITY</test.go2cloud-jhb1.identity>
<test.go2cloud-jhb1.credential>FIXME_CREDENTIAL</test.go2cloud-jhb1.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.go2cloud-jhb1.endpoint}</value>
</property>
<property>
<name>test.go2cloud-jhb1.apiversion</name>
<value>${test.go2cloud-jhb1.apiversion}</value>
<name>test.go2cloud-jhb1.api-version</name>
<value>${test.go2cloud-jhb1.api-version}</value>
</property>
<property>
<name>test.go2cloud-jhb1.identity</name>

6
providers/gogrid/pom.xml
View File

@ -37,7 +37,7 @@
<!-- when instances are hung, open a ticket and add here -->
<jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
<test.gogrid.endpoint>https://api.gogrid.com/api</test.gogrid.endpoint>
<test.gogrid.apiversion>1.5</test.gogrid.apiversion>
<test.gogrid.api-version>1.5</test.gogrid.api-version>
<test.gogrid.identity>FIXME</test.gogrid.identity>
<test.gogrid.credential>FIXME</test.gogrid.credential>
</properties>
@ -98,8 +98,8 @@
<value>${test.gogrid.endpoint}</value>
</property>
<property>
<name>test.gogrid.apiversion</name>
<value>${test.gogrid.apiversion}</value>
<name>test.gogrid.api-version</name>
<value>${test.gogrid.api-version}</value>
</property>
<property>
<name>test.gogrid.identity</name>

8
providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java
View File

@ -100,14 +100,14 @@ public class GoGridLiveTestDisabled {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -118,8 +118,8 @@ public class GoGridLiveTestDisabled {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

8
providers/gogrid/src/test/java/org/jclouds/gogrid/services/BaseGoGridClientLiveTest.java
View File

@ -49,7 +49,7 @@ public class BaseGoGridClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected ComputeServiceContext context;
protected String prefix = System.getProperty("user.name");
@ -58,7 +58,7 @@ public class BaseGoGridClientLiveTest {
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -67,8 +67,8 @@ public class BaseGoGridClientLiveTest {
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
providers/greenhousedata-element-vcloud/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.greenhousedata-element-vcloud.endpoint>https://mycloud.greenhousedata.com/api</test.greenhousedata-element-vcloud.endpoint>
<test.greenhousedata-element-vcloud.apiversion>1.0</test.greenhousedata-element-vcloud.apiversion>
<test.greenhousedata-element-vcloud.api-version>1.0</test.greenhousedata-element-vcloud.api-version>
<test.greenhousedata-element-vcloud.identity>FIXME_IDENTITY</test.greenhousedata-element-vcloud.identity>
<test.greenhousedata-element-vcloud.credential>FIXME_CREDENTIAL</test.greenhousedata-element-vcloud.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.greenhousedata-element-vcloud.endpoint}</value>
</property>
<property>
<name>test.greenhousedata-element-vcloud.apiversion</name>
<value>${test.greenhousedata-element-vcloud.apiversion}</value>
<name>test.greenhousedata-element-vcloud.api-version</name>
<value>${test.greenhousedata-element-vcloud.api-version}</value>
</property>
<property>
<name>test.greenhousedata-element-vcloud.identity</name>

6
providers/ninefold-storage/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.ninefold.storage.blobstore.integration.NinefoldStorageTestInitializer</test.initializer>
<test.ninefold-storage.endpoint>http://onlinestorage.ninefold.com</test.ninefold-storage.endpoint>
<test.ninefold-storage.apiversion>1.4.0</test.ninefold-storage.apiversion>
<test.ninefold-storage.api-version>1.4.0</test.ninefold-storage.api-version>
<test.ninefold-storage.identity>FIXME_IDENTITY</test.ninefold-storage.identity>
<test.ninefold-storage.credential>FIXME_CREDENTIAL</test.ninefold-storage.credential>
</properties>
@ -105,8 +105,8 @@
<value>${test.ninefold-storage.endpoint}</value>
</property>
<property>
<name>test.ninefold-storage.apiversion</name>
<value>${test.ninefold-storage.apiversion}</value>
<name>test.ninefold-storage.api-version</name>
<value>${test.ninefold-storage.api-version}</value>
</property>
<property>
<name>test.ninefold-storage.identity</name>

6
providers/openhosting-east1/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.openhosting-east1.endpoint>https://api.east1.openhosting.com</test.openhosting-east1.endpoint>
<test.openhosting-east1.apiversion>2.0</test.openhosting-east1.apiversion>
<test.openhosting-east1.api-version>2.0</test.openhosting-east1.api-version>
<test.openhosting-east1.identity>FIXME_IDENTITY</test.openhosting-east1.identity>
<test.openhosting-east1.credential>FIXME_CREDENTIAL</test.openhosting-east1.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.openhosting-east1.endpoint}</value>
</property>
<property>
<name>test.openhosting-east1.apiversion</name>
<value>${test.openhosting-east1.apiversion}</value>
<name>test.openhosting-east1.api-version</name>
<value>${test.openhosting-east1.api-version}</value>
</property>
<property>
<name>test.openhosting-east1.identity</name>

6
providers/rimuhosting/pom.xml
View File

@ -37,7 +37,7 @@
<!-- when instances are hung, open a ticket and add here -->
<jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
<test.rimuhosting.endpoint>https://api.rimuhosting.com/r</test.rimuhosting.endpoint>
<test.rimuhosting.apiversion>1.0</test.rimuhosting.apiversion>
<test.rimuhosting.api-version>1.0</test.rimuhosting.api-version>
<test.rimuhosting.identity>FIXME</test.rimuhosting.identity>
</properties>
<dependencies>
@ -106,8 +106,8 @@
<value>${test.rimuhosting.endpoint}</value>
</property>
<property>
<name>test.rimuhosting.apiversion</name>
<value>${test.rimuhosting.apiversion}</value>
<name>test.rimuhosting.api-version</name>
<value>${test.rimuhosting.api-version}</value>
</property>
<property>
<name>test.rimuhosting.identity</name>

8
providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java
View File

@ -56,12 +56,12 @@ public class RimuHostingClientLiveTest {
protected String provider = "rimuhosting";
protected String identity;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -71,8 +71,8 @@ public class RimuHostingClientLiveTest {
overrides.setProperty(provider + ".identity", identity);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
providers/savvis-symphonyvpdc/pom.xml
View File

@ -51,7 +51,7 @@
<!-- when instances are hung, open a ticket and add here -->
<jclouds.compute.blacklist-nodes>node-924</jclouds.compute.blacklist-nodes>
<test.savvis-symphonyvpdc.endpoint>https://api.symphonyvpdc.savvis.net/vpdc</test.savvis-symphonyvpdc.endpoint>
<test.savvis-symphonyvpdc.apiversion>1.0</test.savvis-symphonyvpdc.apiversion>
<test.savvis-symphonyvpdc.api-version>1.0</test.savvis-symphonyvpdc.api-version>
<test.savvis-symphonyvpdc.identity>FIXME</test.savvis-symphonyvpdc.identity>
<test.savvis-symphonyvpdc.credential>FIXME</test.savvis-symphonyvpdc.credential>
<test.savvis-symphonyvpdc.vdc-email>FIXME</test.savvis-symphonyvpdc.vdc-email>
@ -119,8 +119,8 @@
<value>${test.savvis-symphonyvpdc.endpoint}</value>
</property>
<property>
<name>test.savvis-symphonyvpdc.apiversion</name>
<value>${test.savvis-symphonyvpdc.apiversion}</value>
<name>test.savvis-symphonyvpdc.api-version</name>
<value>${test.savvis-symphonyvpdc.api-version}</value>
</property>
<property>
<name>test.savvis-symphonyvpdc.identity</name>

8
providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BaseVPDCClientLiveTest.java
View File

@ -54,7 +54,7 @@ public class BaseVPDCClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected ComputeServiceContext context;
protected String email;
protected RetryablePredicate<String> taskTester;
@ -67,7 +67,7 @@ public class BaseVPDCClientLiveTest {
email = checkNotNull(System.getProperty("test." + VPDCConstants.PROPERTY_VPDC_VDC_EMAIL), "test."
+ VPDCConstants.PROPERTY_VPDC_VDC_EMAIL);
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
protected Properties setupProperties() {
@ -77,8 +77,8 @@ public class BaseVPDCClientLiveTest {
overrides.setProperty(VPDCConstants.PROPERTY_VPDC_VDC_EMAIL, email);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
if (apiVersion != null)
overrides.setProperty(provider + ".api-version", apiVersion);
// TODO savvis uses untrusted certificates, remove these once savvis fixes the issue
overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");

6
providers/serverlove-z1-man/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.serverlove-z1-man.endpoint>https://api.z1-man.serverlove.com</test.serverlove-z1-man.endpoint>
<test.serverlove-z1-man.apiversion>1.0</test.serverlove-z1-man.apiversion>
<test.serverlove-z1-man.api-version>1.0</test.serverlove-z1-man.api-version>
<test.serverlove-z1-man.identity>FIXME_IDENTITY</test.serverlove-z1-man.identity>
<test.serverlove-z1-man.credential>FIXME_CREDENTIAL</test.serverlove-z1-man.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.serverlove-z1-man.endpoint}</value>
</property>
<property>
<name>test.serverlove-z1-man.apiversion</name>
<value>${test.serverlove-z1-man.apiversion}</value>
<name>test.serverlove-z1-man.api-version</name>
<value>${test.serverlove-z1-man.api-version}</value>
</property>
<property>
<name>test.serverlove-z1-man.identity</name>

6
providers/skalicloud-sdg-my/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.skalicloud-sdg-my.endpoint>https://api.sdg-my.skalicloud.com</test.skalicloud-sdg-my.endpoint>
<test.skalicloud-sdg-my.apiversion>1.0</test.skalicloud-sdg-my.apiversion>
<test.skalicloud-sdg-my.api-version>1.0</test.skalicloud-sdg-my.api-version>
<test.skalicloud-sdg-my.identity>FIXME_IDENTITY</test.skalicloud-sdg-my.identity>
<test.skalicloud-sdg-my.credential>FIXME_CREDENTIAL</test.skalicloud-sdg-my.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.skalicloud-sdg-my.endpoint}</value>
</property>
<property>
<name>test.skalicloud-sdg-my.apiversion</name>
<value>${test.skalicloud-sdg-my.apiversion}</value>
<name>test.skalicloud-sdg-my.api-version</name>
<value>${test.skalicloud-sdg-my.api-version}</value>
</property>
<property>
<name>test.skalicloud-sdg-my.identity</name>

6
providers/slicehost/pom.xml
View File

@ -37,7 +37,7 @@
<!-- when instances are hung, open a ticket and add here -->
<jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
<test.slicehost.endpoint>https://api.slicehost.com</test.slicehost.endpoint>
<test.slicehost.apiversion>1.4.1.1</test.slicehost.apiversion>
<test.slicehost.api-version>1.4.1.1</test.slicehost.api-version>
<test.slicehost.identity>FIXME</test.slicehost.identity>
</properties>
<dependencies>
@ -98,8 +98,8 @@
<value>${test.slicehost.endpoint}</value>
</property>
<property>
<name>test.slicehost.apiversion</name>
<value>${test.slicehost.apiversion}</value>
<name>test.slicehost.api-version</name>
<value>${test.slicehost.api-version}</value>
</property>
<property>
<name>test.slicehost.identity</name>

8
providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java
View File

@ -71,13 +71,13 @@ public class SlicehostClientLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
+ ".apiversion");
apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
+ ".api-version");
}
protected Properties setupProperties() {
@ -86,7 +86,7 @@ public class SlicehostClientLiveTest {
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".endpoint", endpoint);
overrides.setProperty(provider + ".apiversion", apiversion);
overrides.setProperty(provider + ".api-version", apiVersion);
return overrides;
}

6
providers/softlayer/pom.xml
View File

@ -49,7 +49,7 @@
<properties>
<test.softlayer.endpoint>https://api.softlayer.com/rest</test.softlayer.endpoint>
<test.softlayer.apiversion>3</test.softlayer.apiversion>
<test.softlayer.api-version>3</test.softlayer.api-version>
<test.softlayer.identity>FIXME</test.softlayer.identity>
<test.softlayer.credential>FIXME</test.softlayer.credential>
</properties>
@ -108,8 +108,8 @@
<value>${test.softlayer.endpoint}</value>
</property>
<property>
<name>test.softlayer.apiversion</name>
<value>${test.softlayer.apiversion}</value>
<name>test.softlayer.api-version</name>
<value>${test.softlayer.api-version}</value>
</property>
<property>
<name>test.softlayer.identity</name>

6
providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java
View File

@ -41,14 +41,14 @@ public class SoftLayerExperimentLiveTest {
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected String apiVersion;
@BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = System.getProperty("test." + provider + ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
apiVersion = System.getProperty("test." + provider + ".api-version");
}
@Test
@ -69,4 +69,4 @@ public class SoftLayerExperimentLiveTest {
}
}
}
}

6
providers/stratogen-vcloud-mycloud/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<test.stratogen-vcloud-mycloud.endpoint>https://vcd.stratogen.net/api</test.stratogen-vcloud-mycloud.endpoint>
<test.stratogen-vcloud-mycloud.apiversion>1.0</test.stratogen-vcloud-mycloud.apiversion>
<test.stratogen-vcloud-mycloud.api-version>1.0</test.stratogen-vcloud-mycloud.api-version>
<test.stratogen-vcloud-mycloud.identity>FIXME_IDENTITY</test.stratogen-vcloud-mycloud.identity>
<test.stratogen-vcloud-mycloud.credential>FIXME_CREDENTIAL</test.stratogen-vcloud-mycloud.credential>
</properties>
@ -103,8 +103,8 @@
<value>${test.stratogen-vcloud-mycloud.endpoint}</value>
</property>
<property>
<name>test.stratogen-vcloud-mycloud.apiversion</name>
<value>${test.stratogen-vcloud-mycloud.apiversion}</value>
<name>test.stratogen-vcloud-mycloud.api-version</name>
<value>${test.stratogen-vcloud-mycloud.api-version}</value>
</property>
<property>
<name>test.stratogen-vcloud-mycloud.identity</name>

6
providers/synaptic-storage/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.initializer>org.jclouds.synaptic.storage.blobstore.integration.SynapticStorageTestInitializer</test.initializer>
<test.synaptic-storage.endpoint>https://storage.synaptic.att.com</test.synaptic-storage.endpoint>
<test.synaptic-storage.apiversion>1.3.0</test.synaptic-storage.apiversion>
<test.synaptic-storage.api-version>1.3.0</test.synaptic-storage.api-version>
<test.synaptic-storage.identity>FIXME_IDENTITY</test.synaptic-storage.identity>
<test.synaptic-storage.credential>FIXME_CREDENTIAL</test.synaptic-storage.credential>
</properties>
@ -105,8 +105,8 @@
<value>${test.synaptic-storage.endpoint}</value>
</property>
<property>
<name>test.synaptic-storage.apiversion</name>
<value>${test.synaptic-storage.apiversion}</value>
<name>test.synaptic-storage.api-version</name>
<value>${test.synaptic-storage.api-version}</value>
</property>
<property>
<name>test.synaptic-storage.identity</name>

6
providers/trmk-ecloud/pom.xml
View File

@ -36,7 +36,7 @@
<properties>
<test.trmk-ecloud.endpoint>https://services.enterprisecloud.terremark.com/api</test.trmk-ecloud.endpoint>
<test.trmk-ecloud.datacenter>MIA</test.trmk-ecloud.datacenter>
<test.trmk-ecloud.apiversion>0.8b-ext2.8</test.trmk-ecloud.apiversion>
<test.trmk-ecloud.api-version>0.8b-ext2.8</test.trmk-ecloud.api-version>
<test.trmk-ecloud.identity>FIXME</test.trmk-ecloud.identity>
<test.trmk-ecloud.credential>FIXME</test.trmk-ecloud.credential>
</properties>
@ -105,8 +105,8 @@
<value>${test.trmk-ecloud.endpoint}</value>
</property>
<property>
<name>test.trmk-ecloud.apiversion</name>
<value>${test.trmk-ecloud.apiversion}</value>
<name>test.trmk-ecloud.api-version</name>
<value>${test.trmk-ecloud.api-version}</value>
</property>
<property>
<name>test.trmk-ecloud.identity</name>

Some files were not shown because too many files have changed in this diff Show More