Repository: jclouds-karaf Updated Branches: refs/heads/master c73104589 -> da66b07b9
Added CloudSigma2 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/da66b07b Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/da66b07b Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/da66b07b Branch: refs/heads/master Commit: da66b07b9f52537325d40463fb535165d7463c48 Parents: c731045 Author: Ignasi Barrera <[email protected]> Authored: Mon Oct 27 22:57:43 2014 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Thu Oct 30 11:13:32 2014 +0100 ---------------------------------------------------------------------- feature/pom.xml | 6 ++ feature/src/main/resources/feature.xml | 35 +++++++++++ .../itests/ApisFeaturesInstallationTest.java | 7 ++- .../CloudSigma2FeaturesInstallationTest.java | 66 ++++++++++++++++++++ 4 files changed, 113 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/da66b07b/feature/pom.xml ---------------------------------------------------------------------- diff --git a/feature/pom.xml b/feature/pom.xml index 326fd38..b8de369 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -110,6 +110,7 @@ limitations under the License. <feature>jclouds-compute</feature> <feature>jclouds-management</feature> <feature>jclouds-api-byon</feature> + <feature>jclouds-api-cloudsigma2</feature> <feature>jclouds-api-cloudstack</feature> <feature>jclouds-api-elasticstack</feature> <feature>jclouds-api-filesystem</feature> @@ -129,6 +130,11 @@ limitations under the License. <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> + <feature>jclouds-cloudsigma2-wdc</feature> + <feature>jclouds-cloudsigma2-zrh</feature> <feature>jclouds-digitalocean</feature> <feature>jclouds-dynect</feature> <feature>jclouds-elastichosts-lon-b</feature> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/da66b07b/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index afbc3f8..818d49c 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -155,6 +155,11 @@ limitations under the License. <bundle>mvn:org.apache.jclouds.api/route53/${jclouds.version}</bundle> </feature> + <feature name='jclouds-api-cloudsigma2' description='jclouds - API - CloudSigma v2' version='${project.version}' resolver='(obr)'> + <feature version='${project.version}'>jclouds-compute</feature> + <bundle>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle> + </feature> + <feature name='jclouds-aws-cloudwatch' description='Amazon Web Service - Cloudwatch' version='${project.version}' resolver='(obr)'> <feature version='${project.version}'>jclouds-api-sts</feature> <bundle>mvn:org.apache.jclouds.api/cloudwatch/${jclouds.version}</bundle> @@ -380,6 +385,36 @@ limitations under the License. <bundle>mvn:org.apache.jclouds.labs/digitalocean/${jclouds.version}</bundle> </feature> + <feature name='jclouds-cloudsigma2-hnl' description='CloudSigma v2 Honolulu' version='${project.version}' resolver='(obr)'> + <feature version='${project.version}'>jclouds-compute</feature> + <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-hnl/${jclouds.version}</bundle> + </feature> + + <feature name='jclouds-cloudsigma2-lvs' description='CloudSigma v2 Las Vegas' version='${project.version}' resolver='(obr)'> + <feature version='${project.version}'>jclouds-compute</feature> + <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-lvs/${jclouds.version}</bundle> + </feature> + + <feature name='jclouds-cloudsigma2-sjc' description='CloudSigma v2 San Jose' version='${project.version}' resolver='(obr)'> + <feature version='${project.version}'>jclouds-compute</feature> + <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-sjc/${jclouds.version}</bundle> + </feature> + + <feature name='jclouds-cloudsigma2-wdc' description='CloudSigma v2 Washington DC' version='${project.version}' resolver='(obr)'> + <feature version='${project.version}'>jclouds-compute</feature> + <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-wdc/${jclouds.version}</bundle> + </feature> + + <feature name='jclouds-cloudsigma2-zrh' description='CloudSigma v2 Zurich' version='${project.version}' resolver='(obr)'> + <feature version='${project.version}'>jclouds-compute</feature> + <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-zrh/${jclouds.version}</bundle> + </feature> + <feature name="jclouds-services" description="OSGi Service Factories for jclouds" version="${project.version}" resolver="(obr)"> <configfile finalname="/etc/org.apache.jclouds.credentials.cfg">mvn:org.apache.jclouds.karaf/jclouds-karaf/${project.version}/cfg/credentials</configfile> <feature version='${project.version}'>jclouds-compute</feature> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/da66b07b/itests/src/test/java/org/jclouds/karaf/itests/ApisFeaturesInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/ApisFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/ApisFeaturesInstallationTest.java index 3cb97fa..9d5ead7 100644 --- a/itests/src/test/java/org/jclouds/karaf/itests/ApisFeaturesInstallationTest.java +++ b/itests/src/test/java/org/jclouds/karaf/itests/ApisFeaturesInstallationTest.java @@ -88,5 +88,10 @@ public class ApisFeaturesInstallationTest extends JcloudsFeaturesTestSupport { public void testSwiftFeature() throws Exception { installAndCheckFeature("jclouds-api-swift"); } - + + @Test + public void testCloudSigma2Feature() throws Exception { + installAndCheckFeature("jclouds-api-cloudsigma2"); + } + } http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/da66b07b/itests/src/test/java/org/jclouds/karaf/itests/CloudSigma2FeaturesInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/CloudSigma2FeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/CloudSigma2FeaturesInstallationTest.java new file mode 100644 index 0000000..f9d848a --- /dev/null +++ b/itests/src/test/java/org/jclouds/karaf/itests/CloudSigma2FeaturesInstallationTest.java @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jclouds.karaf.itests; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.junit.ExamReactorStrategy; +import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; + +@RunWith(JUnit4TestRunner.class) +@ExamReactorStrategy(AllConfinedStagedReactorFactory.class) +public class CloudSigma2FeaturesInstallationTest extends JcloudsFeaturesTestSupport { + + @Before + public void setUp() { + System.err.println(executeCommand("features:addurl " + getJcloudsKarafFeatureURL())); + } + + @After + public void tearDown() { + + } + + @Test + public void testCloudSigma2Honolulu() throws Exception { + installAndCheckFeature("jclouds-cloudsigma2-hnl"); + } + + @Test + public void testCloudSigma2LasVegas() throws Exception { + installAndCheckFeature("jclouds-cloudsigma2-lvs"); + } + + @Test + public void testCloudSigma2SanJose() throws Exception { + installAndCheckFeature("jclouds-cloudsigma2-sjc"); + } + + @Test + public void testCloudSigma2Washington() throws Exception { + installAndCheckFeature("jclouds-cloudsigma2-wdc"); + } + + @Test + public void testCloudSigma2Zurich() throws Exception { + installAndCheckFeature("jclouds-cloudsigma2-zrh"); + } +}
