You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/03/19 10:04:41 UTC
jclouds-karaf git commit: Remove the old Rackspace compute providers
Repository: jclouds-karaf
Updated Branches:
refs/heads/master 8395ab908 -> d6052c7b2
Remove the old Rackspace compute providers
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/d6052c7b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/d6052c7b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/d6052c7b
Branch: refs/heads/master
Commit: d6052c7b25110a2f8d08c992830017fb3a6ceb82
Parents: 8395ab9
Author: Ignasi Barrera <na...@apache.org>
Authored: Sun Mar 15 00:44:56 2015 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Mar 19 10:04:22 2015 +0100
----------------------------------------------------------------------
feature/pom.xml | 2 --
feature/src/main/resources/feature.xml | 16 ----------------
.../itests/RackspaceFeaturesInstallationTest.java | 10 ----------
.../karaf/itests/live/RackspaceLiveTest.java | 4 ++--
4 files changed, 2 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d6052c7b/feature/pom.xml
----------------------------------------------------------------------
diff --git a/feature/pom.xml b/feature/pom.xml
index 273dd05..a7eab75 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -126,8 +126,6 @@ limitations under the License.
<feature>jclouds-azureblob</feature>
<feature>jclouds-cloudfiles-uk</feature>
<feature>jclouds-cloudfiles-us</feature>
- <feature>jclouds-cloudserver-uk</feature>
- <feature>jclouds-cloudserver-us</feature>
<feature>jclouds-cloudsigma2-hnl</feature>
<feature>jclouds-cloudsigma2-lvs</feature>
<feature>jclouds-cloudsigma2-sjc</feature>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d6052c7b/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index 9a7ea6a..f480168 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -229,22 +229,6 @@ limitations under the License.
<bundle>mvn:org.apache.jclouds.provider/rackspace-cloudloadbalancers-uk/${jclouds.version}</bundle>
</feature>
- <feature name='jclouds-cloudserver-uk' description='Cloudservers UK' version='${project.version}' resolver='(obr)'>
- <feature version='${project.version}'>jclouds-compute</feature>
- <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jclouds.api/cloudservers/${jclouds.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-compute/${jclouds.version}</bundle>
- <bundle>mvn:org.apache.jclouds.provider/cloudservers-uk/${jclouds.version}</bundle>
- </feature>
-
- <feature name='jclouds-cloudserver-us' description='Cloudservers US' version='${project.version}' resolver='(obr)'>
- <feature version='${project.version}'>jclouds-compute</feature>
- <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jclouds.api/cloudservers/${jclouds.version}</bundle>
- <bundle>mvn:org.apache.jclouds.provider/cloudservers-us/${jclouds.version}</bundle>
- </feature>
-
<feature name='jclouds-rackspace-cloudservers-us' description='Rackspace Cloudservers US' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<feature version='${project.version}'>jclouds-api-openstack-nova</feature>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d6052c7b/itests/src/test/java/org/jclouds/karaf/itests/RackspaceFeaturesInstallationTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/RackspaceFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/RackspaceFeaturesInstallationTest.java
index 2e64e8e..03cee35 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/RackspaceFeaturesInstallationTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/RackspaceFeaturesInstallationTest.java
@@ -50,16 +50,6 @@ public class RackspaceFeaturesInstallationTest extends JcloudsFeaturesTestSuppor
}
@Test
- public void testCloudServersUsFeature() throws Exception {
- installAndCheckFeature("jclouds-cloudserver-us");
- }
-
- @Test
- public void testCloudServersUkFeature() throws Exception {
- installAndCheckFeature("jclouds-cloudserver-uk");
- }
-
- @Test
public void testCloudFilesUsFeature() throws Exception {
installAndCheckFeature("jclouds-cloudfiles-us");
}
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d6052c7b/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java b/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java
index 58d728d..074e2da 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java
@@ -70,7 +70,7 @@ public class RackspaceLiveTest extends JcloudsLiveTestSupport {
@Test
public void testNodeCreateLive() throws InterruptedException {
if (isComputeLiveConfigured()) {
- createManagedComputeService("cloudservers-us", false);
+ createManagedComputeService("rackspace-cloudservers-us", false);
ComputeService computeService = getOsgiService(ComputeService.class, 1000000L);
Thread.sleep(DEFAULT_TIMEOUT);
System.err.println(executeCommand("jclouds:image-list"));
@@ -90,7 +90,7 @@ public class RackspaceLiveTest extends JcloudsLiveTestSupport {
systemProperty("jclouds.rackspace.image"),
systemProperty("jclouds.rackspace.location"),
systemProperty("jclouds.rackspace.user"),
- scanFeatures(String.format(JCLOUDS_FEATURE_FORMAT, MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID)), "jclouds", "jclouds-compute", "jclouds-cloudserver-us").start()
+ scanFeatures(String.format(JCLOUDS_FEATURE_FORMAT, MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID)), "jclouds", "jclouds-compute", "jclouds-rackspace-cloudserver-us").start()
};
}
}