You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/05/09 21:11:39 UTC
git commit: Updated Service Type refs
Repository: jclouds-labs-openstack
Updated Branches:
refs/heads/master ec60db6be -> 02ab5a991
Updated Service Type refs
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/02ab5a99
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/02ab5a99
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/02ab5a99
Branch: refs/heads/master
Commit: 02ab5a991f11c8ed22de775348b403f1ee294134
Parents: ec60db6
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Tue May 6 08:56:57 2014 -0700
Committer: Jeremy Daggett <je...@rackspace.com>
Committed: Fri May 9 12:10:07 2014 -0700
----------------------------------------------------------------------
.../org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java | 2 +-
.../rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java | 3 ++-
.../org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java | 3 ++-
.../rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java | 3 ++-
.../cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java | 3 ++-
.../rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java | 3 ++-
.../cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java | 3 ++-
7 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/02ab5a99/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
index 8ae1a94..bc95793 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
@@ -57,8 +57,8 @@ public class NeutronApiMetadata extends BaseHttpApiMetadata<NeutronApi> {
public static Properties defaultProperties() {
Properties properties = BaseHttpApiMetadata.defaultProperties();
- properties.setProperty(SERVICE_TYPE, ServiceType.NETWORK);
properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
+ properties.setProperty(SERVICE_TYPE, ServiceType.NETWORK);
return properties;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/02ab5a99/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
index 27036f8..c042c05 100644
--- a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
+++ b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
@@ -31,6 +31,7 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.autoscale.v1.AutoscaleApiMetadata;
import org.jclouds.rackspace.autoscale.v1.config.AutoscaleHttpApiModule;
import org.jclouds.rackspace.autoscale.v1.config.AutoscaleParserModule;
+import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
@@ -66,7 +67,7 @@ public class AutoscaleUSProviderMetadata extends BaseProviderMetadata {
public static Properties defaultProperties() {
Properties properties = new Properties();
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, "rax:autoscale");
+ properties.setProperty(SERVICE_TYPE, ServiceType.AUTO_SCALE);
//properties.setProperty(PROPERTY_ZONES, "ORD,DFW,SYD");
properties.setProperty(PROPERTY_ZONES, "ORD,DFW");
properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/02ab5a99/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java
index 431152d..4dc4c63 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java
@@ -26,6 +26,7 @@ import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
import org.jclouds.rackspace.autoscale.v1.config.AutoscaleHttpApiModule;
import org.jclouds.rackspace.autoscale.v1.config.AutoscaleParserModule;
+import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
@@ -56,7 +57,7 @@ public class AutoscaleApiMetadata extends BaseHttpApiMetadata<AutoscaleApi> {
public static Properties defaultProperties() {
Properties properties = BaseHttpApiMetadata.defaultProperties();
- properties.setProperty(SERVICE_TYPE, "rax:autoscale");
+ properties.setProperty(SERVICE_TYPE, ServiceType.AUTO_SCALE);
properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
return properties;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/02ab5a99/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java
index d5b4b4f..1784c8c 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java
@@ -24,6 +24,7 @@ import java.util.Properties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.jclouds.rackspace.autoscale.v1.AutoscaleApi;
+import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
/**
* Base class for writing Autoscale Expect tests
@@ -34,7 +35,7 @@ public class BaseAutoscaleApiMockTest extends BaseOpenStackMockTest<AutoscaleApi
protected Properties overrides;
public BaseAutoscaleApiMockTest() {
overrides = new Properties();
- overrides.setProperty(SERVICE_TYPE, "rax:autoscale");
overrides.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
+ overrides.setProperty(SERVICE_TYPE, ServiceType.AUTO_SCALE);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/02ab5a99/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java b/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java
index a2dbf72..3e25e1d 100644
--- a/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java
+++ b/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java
@@ -31,6 +31,7 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.cloudbigdata.v1.CloudBigDataApiMetadata;
import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataHttpApiModule;
import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataParserModule;
+import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
@@ -78,7 +79,7 @@ public class CloudBigDataUSProviderMetadata extends BaseProviderMetadata {
public static Properties defaultProperties() {
Properties properties = new Properties();
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, "rax:bigdata");
+ properties.setProperty(SERVICE_TYPE, ServiceType.BIG_DATA);
//properties.setProperty(PROPERTY_ZONES, "ORD,DFW,SYD");
properties.setProperty(PROPERTY_ZONES, "ORD");
properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/02ab5a99/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java
index 8570ab6..fc56d28 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java
@@ -26,6 +26,7 @@ import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataHttpApiModule;
import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataParserModule;
+import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
@@ -59,7 +60,7 @@ public class CloudBigDataApiMetadata extends BaseHttpApiMetadata<CloudBigDataApi
public static Properties defaultProperties() {
Properties properties = BaseHttpApiMetadata.defaultProperties();
- properties.setProperty(SERVICE_TYPE, "rax:bigdata");
+ properties.setProperty(SERVICE_TYPE, ServiceType.BIG_DATA);
properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
return properties;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/02ab5a99/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java
index 2055256..b2b3fa4 100644
--- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java
+++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java
@@ -24,6 +24,7 @@ import java.util.Properties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.jclouds.rackspace.cloudbigdata.v1.CloudBigDataApi;
+import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
/**
* Base class for writing Cloud Big Data Expect tests
@@ -37,7 +38,7 @@ public class BaseCloudBigDataApiMockTest extends BaseOpenStackMockTest<CloudBigD
*/
public BaseCloudBigDataApiMockTest() {
overrides = new Properties();
- overrides.setProperty(SERVICE_TYPE, "rax:bigdata");
overrides.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
+ overrides.setProperty(SERVICE_TYPE, ServiceType.BIG_DATA);
}
}