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

Merge pull request #559 from grkvlt/carrenza 

Carrenza vCloud Director Provider
This commit is contained in:
Adrian Cole 2012-04-12 07:21:24 -07:00
parent 5246796b4c ee9a659b7e
commit 9c13934556
33 changed files with 144 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
labs/carrenza-element-vcloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
View File

@ -1 +0,0 @@
org.jclouds.carrenza.element.vcloud.CarrenzaElementVCloudProviderMetadata

65
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorTemplateBuilderLiveTest.java
View File

@ -1,65 +0,0 @@
/**
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. jclouds 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.carrenza.vcloud.director.compute;
import org.testng.annotations.Test;
/**
*
* @author danikov
*/
@Test(groups = "live", testName = "CarrenzaVCloudDirectorTemplateBuilderLiveTest")
public class CarrenzaVCloudDirectorTemplateBuilderLiveTest {
// BaseTemplateBuilderLiveTest<VCloudDirectorClient, VCloudDirectorAsyncClient, VCloudDirectorContext> {
//
// public CarrenzaVCloudDirectorTemplateBuilderLiveTest() {
// provider = "carrenza-vcloud-director";
// }
//
// @Override
// protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
// return new Predicate<OsFamilyVersion64Bit>() {
//
// @Override
// public boolean apply(OsFamilyVersion64Bit input) {
// switch (input.family) {
// case UBUNTU:
// return !input.version.equals("") || !input.is64Bit;
// default:
// return true;
// }
// }
//
// };
// }
//
// @Override
// public void testDefaultTemplateBuilder() throws IOException {
// Template defaultTemplate = context.getComputeService().templateBuilder().build();
// assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "");
// assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
// assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
// assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
// }
//
// @Override
// protected Set<String> getIso3166Codes() {
// return ImmutableSet.<String> of("GB-LND");
// }
}

48
labs/carrenza-element-vcloud/pom.xml → labs/carrenza-vcloud-director/pom.xml
View File

@ -30,18 +30,24 @@
<groupId>org.jclouds.labs</groupId>
<artifactId>carrenza-vcloud-director</artifactId>
<name>jclouds Carrenza vCloud Director provider</name>
<description>vCloud implementation targeted to Carrenza</description>
<description>vCloud Director implementation targeted to Carrenza</description>
<packaging>bundle</packaging>
<properties>
<test.carrenza-vcloud.endpoint>https://myvdc.carrenza.net/api</test.carrenza-vcloud.endpoint>
<test.carrenza-vcloud.api-version>1.5</test.carrenza-vcloud.api-version>
<test.carrenza-vcloud.build-version>FIXME_VERSION</test.carrenza-vcloud.build-version>
<test.carrenza-vcloud.identity>FIXME_IDENTITY</test.carrenza-vcloud.identity>
<test.carrenza-vcloud.credential>FIXME_CREDENTIAL</test.carrenza-vcloud.credential>
<test.carrenza-vcloud.image-id></test.carrenza-vcloud.image-id>
<test.carrenza-vcloud.image.login-user></test.carrenza-vcloud.image.login-user>
<test.carrenza-vcloud.image.authenticate-sudo></test.carrenza-vcloud.image.authenticate-sudo>
<test.carrenza-vcloud-director.endpoint>https://myvdc.carrenza.net/api</test.carrenza-vcloud-director.endpoint>
<test.carrenza-vcloud-director.api-version>1.5</test.carrenza-vcloud-director.api-version>
<test.carrenza-vcloud-director.build-version>464915</test.carrenza-vcloud-director.build-version>
<test.carrenza-vcloud-director.identity>FIXME_IDENTITY</test.carrenza-vcloud-director.identity>
<test.carrenza-vcloud-director.credential>FIXME_CREDENTIAL</test.carrenza-vcloud-director.credential>
<test.carrenza-vcloud-director.image-id></test.carrenza-vcloud-director.image-id>
<test.carrenza-vcloud-director.image.login-user></test.carrenza-vcloud-director.image.login-user>
<test.carrenza-vcloud-director.image.authenticate-sudo></test.carrenza-vcloud-director.image.authenticate-sudo>
<test.carrenza-vcloud-director.catalog-id></test.carrenza-vcloud-director.catalog-id>
<test.carrenza-vcloud-director.media-id></test.carrenza-vcloud-director.media-id>
<test.carrenza-vcloud-director.vapptemplate-id></test.carrenza-vcloud-director.vapptemplate-id>
<test.carrenza-vcloud-director.network-name></test.carrenza-vcloud-director.network-name>
<test.carrenza-vcloud-director.network-id></test.carrenza-vcloud-director.network-id>
<test.carrenza-vcloud-director.vdc-id></test.carrenza-vcloud-director.vdc-id>
</properties>
<dependencies>
@ -102,14 +108,20 @@
</goals>
<configuration>
<systemPropertyVariables>
<test.carrenza-vcloud.endpoint>${test.carrenza-vcloud.endpoint}</test.carrenza-vcloud.endpoint>
<test.carrenza-vcloud.api-version>${test.carrenza-vcloud.api-version}</test.carrenza-vcloud.api-version>
<test.carrenza-vcloud.build-version>${test.carrenza-vcloud.build-version}</test.carrenza-vcloud.build-version>
<test.carrenza-vcloud.identity>${test.carrenza-vcloud.identity}</test.carrenza-vcloud.identity>
<test.carrenza-vcloud.credential>${test.carrenza-vcloud.credential}</test.carrenza-vcloud.credential>
<test.carrenza-vcloud.image-id>${test.carrenza-vcloud.image-id}</test.carrenza-vcloud.image-id>
<test.carrenza-vcloud.image.login-user>${test.carrenza-vcloud.image.login-user}</test.carrenza-vcloud.image.login-user>
<test.carrenza-vcloud.image.authenticate-sudo>${test.carrenza-vcloud.image.authenticate-sudo}</test.carrenza-vcloud.image.authenticate-sudo>
<test.carrenza-vcloud-director.endpoint>${test.carrenza-vcloud-director.endpoint}</test.carrenza-vcloud-director.endpoint>
<test.carrenza-vcloud-director.api-version>${test.carrenza-vcloud-director.api-version}</test.carrenza-vcloud-director.api-version>
<test.carrenza-vcloud-director.build-version>${test.carrenza-vcloud-director.build-version}</test.carrenza-vcloud-director.build-version>
<test.carrenza-vcloud-director.identity>${test.carrenza-vcloud-director.identity}</test.carrenza-vcloud-director.identity>
<test.carrenza-vcloud-director.credential>${test.carrenza-vcloud-director.credential}</test.carrenza-vcloud-director.credential>
<test.carrenza-vcloud-director.image-id>${test.carrenza-vcloud-director.image-id}</test.carrenza-vcloud-director.image-id>
<test.carrenza-vcloud-director.image.login-user>${test.carrenza-vcloud-director.image.login-user}</test.carrenza-vcloud-director.image.login-user>
<test.carrenza-vcloud-director.image.authenticate-sudo>${test.carrenza-vcloud-director.image.authenticate-sudo}</test.carrenza-vcloud-director.image.authenticate-sudo>
<test.carrenza-vcloud-director.catalog-id>${test.carrenza-vcloud-director.catalog-id}</test.carrenza-vcloud-director.catalog-id>
<test.carrenza-vcloud-director.media-id>${test.carrenza-vcloud-director.media-id}</test.carrenza-vcloud-director.media-id>
<test.carrenza-vcloud-director.vapptemplate-id>${test.carrenza-vcloud-director.vapptemplate-id}</test.carrenza-vcloud-director.vapptemplate-id>
<test.carrenza-vcloud-director.network-id>${test.carrenza-vcloud-director.network-id}</test.carrenza-vcloud-director.network-id>
<test.carrenza-vcloud-director.vdc-id>${test.carrenza-vcloud-director.vdc-id}</test.carrenza-vcloud-director.vdc-id>
<test.carrenza-vcloud-director.user-id>${test.carrenza-vcloud-director.user-id}</test.carrenza-vcloud-director.user-id>
</systemPropertyVariables>
</configuration>
</execution>
@ -128,7 +140,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.jclouds.carrenza.vcloud*;version="${project.version}"</Export-Package>
<Export-Package>org.jclouds.carrenza.vcloud.director*;version="${project.version}"</Export-Package>
<Import-Package>
org.jclouds.compute.internal;version="${project.version}",
org.jclouds.rest.internal;version="${project.version}",

0
labs/carrenza-element-vcloud/src/main/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorContextBuilder.java → labs/carrenza-vcloud-director/src/main/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorContextBuilder.java
View File

13
labs/carrenza-element-vcloud/src/main/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorProviderMetadata.java → labs/carrenza-vcloud-director/src/main/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorProviderMetadata.java
View File

@ -19,6 +19,7 @@
package org.jclouds.carrenza.vcloud.director;
import static org.jclouds.Constants.PROPERTY_BUILD_VERSION;
import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.*;
import java.net.URI;
import java.util.Properties;
@ -33,9 +34,10 @@ import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient;
import com.google.common.reflect.TypeToken;
/**
* Implementation of {@link org.jclouds.types.ProviderMetadata} for StratoGen VMware hosting
* Implementation of {@link org.jclouds.types.ProviderMetadata} for Carrenza vCloud hosting
*
* @author Adrian Cole
* @author grkvlt@apache.org
*/
public class CarrenzaVCloudDirectorProviderMetadata
extends
@ -60,19 +62,20 @@ public class CarrenzaVCloudDirectorProviderMetadata
protected static Properties defaultProperties() {
Properties properties = new Properties();
properties.setProperty(PROPERTY_BUILD_VERSION, "???"); //FIXME
// properties.setProperty(PROPERTY_VCLOUD_DEFAULT_NETWORK, "orgNet-.*-External"); FIXME: needed?
properties.setProperty(PROPERTY_BUILD_VERSION, "1.5.0.464915");
properties.setProperty(PROPERTY_VCLOUD_DIRECTOR_DEFAULT_NETWORK, "orgNet-.*-External");
return properties;
}
public static class Builder extends BaseProviderMetadata.Builder<VCloudDirectorClient, VCloudDirectorAsyncClient, VCloudDirectorContext, VCloudDirectorApiMetadata> {
protected Builder(){
protected Builder() {
id("carrenza-vcloud-director")
.name("Carrenza vCloud Director")
.apiMetadata(new VCloudDirectorApiMetadata().toBuilder()
.buildVersion("1.5.0.464915")
.contextBuilder(TypeToken.of(CarrenzaVCloudDirectorContextBuilder.class)).build())
.contextBuilder(TypeToken.of(CarrenzaVCloudDirectorContextBuilder.class))
.build())
.homepage(URI.create("http://carrenza.com/"))
.console(URI.create("https://myvdc.carrenza.net/cloud/org/YOUR_ORG_HERE"))
.iso3166Codes("GB-LND")

0
labs/carrenza-element-vcloud/src/main/java/org/jclouds/carrenza/vcloud/director/config/CarrenzaVCloudDirectorComputeServiceContextModule.java → labs/carrenza-vcloud-director/src/main/java/org/jclouds/carrenza/vcloud/director/config/CarrenzaVCloudDirectorComputeServiceContextModule.java
View File

0
labs/carrenza-element-vcloud/src/main/java/org/jclouds/carrenza/vcloud/director/config/CarrenzaVCloudDirectorRestClientModule.java → labs/carrenza-vcloud-director/src/main/java/org/jclouds/carrenza/vcloud/director/config/CarrenzaVCloudDirectorRestClientModule.java
View File

1
labs/carrenza-vcloud-director/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata Normal file
View File

@ -0,0 +1 @@
org.jclouds.carrenza.vcloud.director.CarrenzaVCloudDirectorProviderMetadata

9
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorNonClientOperationsLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorHttpClientLiveTest.java
View File

@ -22,14 +22,15 @@ import org.jclouds.vcloud.director.v1_5.HttpClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorNonClientOperationsLiveTest")
public class CarrenzaVCloudDirectorNonClientOperationsLiveTest extends HttpClientLiveTest {
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorHttpClientLiveTest")
public class CarrenzaVCloudDirectorHttpClientLiveTest extends HttpClientLiveTest {
public CarrenzaVCloudDirectorNonClientOperationsLiveTest() {
public CarrenzaVCloudDirectorHttpClientLiveTest() {
provider = "carrenza-vcloud-director";
}
}

0
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorProviderTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorProviderTest.java
View File

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorComputeServiceLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorComputeServiceLiveTest.java
View File

@ -21,11 +21,12 @@ package org.jclouds.carrenza.vcloud.director.compute;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorComputeServiceLiveTest")
@Test(groups = { "live", "compute" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorComputeServiceLiveTest")
public class CarrenzaVCloudDirectorComputeServiceLiveTest { // FIXME: enable when compute service done
// extends VCloudDirectorComputeServiceLiveTest {
//

36
labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorTemplateBuilderLiveTest.java Normal file
View File

@ -0,0 +1,36 @@
/**
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. jclouds 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.carrenza.vcloud.director.compute;
import org.testng.annotations.Test;
/**
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = { "live", "compute" }, testName = "CarrenzaVCloudDirectorTemplateBuilderLiveTest")
public class CarrenzaVCloudDirectorTemplateBuilderLiveTest {
// BaseTemplateBuilderLiveTest<VCloudDirectorClient, VCloudDirectorAsyncClient, VCloudDirectorContext> {
//
// public CarrenzaVCloudDirectorTemplateBuilderLiveTest() {
// provider = "carrenza-vcloud-director";
// }
}

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorCatalogClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorCatalogClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.CatalogClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorCatalogClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorCatalogClientLiveTest")
public class CarrenzaVCloudDirectorCatalogClientLiveTest extends CatalogClientLiveTest {
public CarrenzaVCloudDirectorCatalogClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorMediaClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorMediaClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.MediaClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorMediaClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorMediaClientLiveTest")
public class CarrenzaVCloudDirectorMediaClientLiveTest extends MediaClientLiveTest {
public CarrenzaVCloudDirectorMediaClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorNetworkClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorNetworkClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.NetworkClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorNetworkClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorNetworkClientLiveTest")
public class CarrenzaVCloudDirectorNetworkClientLiveTest extends NetworkClientLiveTest {
public CarrenzaVCloudDirectorNetworkClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorOrgClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorOrgClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.OrgClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorOrgClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorOrgClientLiveTest")
public class CarrenzaVCloudDirectorOrgClientLiveTest extends OrgClientLiveTest {
public CarrenzaVCloudDirectorOrgClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorQueryClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorQueryClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.QueryClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorQueryClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorQueryClientLiveTest")
public class CarrenzaVCloudDirectorQueryClientLiveTest extends QueryClientLiveTest {
public CarrenzaVCloudDirectorQueryClientLiveTest() {

7
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorTaskClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorTaskClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.TaskClientLiveTest;
import org.testng.annotations.Test;
/**
* {@inheritDoc}
*
*
* @author Adrian Cole
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorTaskClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorTaskClientLiveTest")
public class CarrenzaVCloudDirectorTaskClientLiveTest extends TaskClientLiveTest {
public CarrenzaVCloudDirectorTaskClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorUploadClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorUploadClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.UploadClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorUploadClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorUploadClientLiveTest")
public class CarrenzaVCloudDirectorUploadClientLiveTest extends UploadClientLiveTest {
public CarrenzaVCloudDirectorUploadClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.VAppClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorVAppClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorVAppClientLiveTest")
public class CarrenzaVCloudDirectorVAppClientLiveTest extends VAppClientLiveTest {
public CarrenzaVCloudDirectorVAppClientLiveTest() {

7
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppTemplateClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppTemplateClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.VAppTemplateClientLiveTest;
import org.testng.annotations.Test;
/**
* {@inheritDoc}
*
*
* @author Adrian Cole
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorVAppTemplateClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorVAppTemplateClientLiveTest")
public class CarrenzaVCloudDirectorVAppTemplateClientLiveTest extends VAppTemplateClientLiveTest {
public CarrenzaVCloudDirectorVAppTemplateClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVdcClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVdcClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.VdcClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorVDCClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorVDCClientLiveTest")
public class CarrenzaVCloudDirectorVdcClientLiveTest extends VdcClientLiveTest {
public CarrenzaVCloudDirectorVdcClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminCatalogClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminCatalogClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClientLiveTes
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminCatalogClientLiveTest")
@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminCatalogClientLiveTest")
public class CarrenzaVCloudDirectorAdminCatalogClientLiveTest extends AdminCatalogClientLiveTest {
public CarrenzaVCloudDirectorAdminCatalogClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminNetworkClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminNetworkClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClientLiveTes
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminNetworkClientLiveTest")
@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminNetworkClientLiveTest")
public class CarrenzaVCloudDirectorAdminNetworkClientLiveTest extends AdminNetworkClientLiveTest {
public CarrenzaVCloudDirectorAdminNetworkClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminOrgClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminOrgClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorOrgClientLiveTest")
@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorOrgClientLiveTest")
public class CarrenzaVCloudDirectorAdminOrgClientLiveTest extends AdminOrgClientLiveTest {
public CarrenzaVCloudDirectorAdminOrgClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminQueryClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminQueryClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminQueryClientLiveTest")
@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminQueryClientLiveTest")
public class CarrenzaVCloudDirectorAdminQueryClientLiveTest extends AdminQueryClientLiveTest {
public CarrenzaVCloudDirectorAdminQueryClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminVdcClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminVdcClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminVdcClientLiveTest")
@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminVdcClientLiveTest")
public class CarrenzaVCloudDirectorAdminVdcClientLiveTest extends AdminVdcClientLiveTest {
public CarrenzaVCloudDirectorAdminVdcClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorGroupClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorGroupClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.GroupClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorGroupClientLiveTest")
@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorGroupClientLiveTest")
public class CarrenzaVCloudDirectorGroupClientLiveTest extends GroupClientLiveTest {
public CarrenzaVCloudDirectorGroupClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorUserClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorUserClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.UserClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorUserClientLiveTest")
@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorUserClientLiveTest")
public class CarrenzaVCloudDirectorUserClientLiveTest extends UserClientLiveTest {
public CarrenzaVCloudDirectorUserClientLiveTest() {

5
labs/carrenza-element-vcloud/src/test/java/org/jclouds/carrenza/vcloud/director/login/CarrenzaVCloudDirectorSessionClientLiveTest.java → labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/login/CarrenzaVCloudDirectorSessionClientLiveTest.java
View File

@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.login.SessionClientLiveTest;
import org.testng.annotations.Test;
/**
*
* {@inheritDoc}
*
* @author danikov
* @author grkvlt
*/
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorSessionClientLiveTest")
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorSessionClientLiveTest")
public class CarrenzaVCloudDirectorSessionClientLiveTest extends SessionClientLiveTest {
public CarrenzaVCloudDirectorSessionClientLiveTest() {

0
labs/carrenza-element-vcloud/src/test/resources/log4j.xml → labs/carrenza-vcloud-director/src/test/resources/log4j.xml
View File

1
labs/pom.xml
View File

@ -40,5 +40,6 @@
<module>aws-elb</module>
<module>savvis-symphonyvpdc</module>
<module>dmtf</module>
<module>carrenza-vcloud-director</module>
</modules>
</project>

10
labs/vcloud-director/pom.xml
View File

@ -29,7 +29,7 @@
</parent>
<groupId>org.jclouds.labs</groupId>
<artifactId>vcloud-director</artifactId>
<name>jcloud vcloud-director api</name>
<name>jclouds vcloud-director api</name>
<description>jclouds components to access an implementation of VMware vCloud Director 1.5+</description>
<packaging>bundle</packaging>
@ -42,13 +42,12 @@
<test.vcloud-director.image-id></test.vcloud-director.image-id>
<test.vcloud-director.image.login-user></test.vcloud-director.image.login-user>
<test.vcloud-director.image.authenticate-sudo></test.vcloud-director.image.authenticate-sudo>
<test.vcloud-director.catalog-name>Public</test.vcloud-director.catalog-name>
<test.vcloud-director.catalog-id></test.vcloud-director.catalog-id>
<test.vcloud-director.media-id></test.vcloud-director.media-id>
<test.vcloud-director.vapptemplate-id></test.vcloud-director.vapptemplate-id>
<test.vcloud-director.network-name></test.vcloud-director.network-name>
<test.vcloud-director.network-id></test.vcloud-director.network-id>
<test.vcloud-director.vdc-id></test.vcloud-director.vdc-id>
<test.vcloud-director.user-id></test.vcloud-director.user-id>
</properties>
<dependencies>
@ -122,12 +121,11 @@
<test.vcloud-director.image.login-user>${test.vcloud-director.image.login-user}</test.vcloud-director.image.login-user>
<test.vcloud-director.image.authenticate-sudo>${test.vcloud-director.image.authenticate-sudo}</test.vcloud-director.image.authenticate-sudo>
<test.vcloud-director.catalog-id>${test.vcloud-director.catalog-id}</test.vcloud-director.catalog-id>
<test.vcloud-director.catalog-name>${test.vcloud-director.catalog-name}</test.vcloud-director.catalog-name>
<test.vcloud-director.media-id>${test.vcloud-director.media-id}</test.vcloud-director.media-id>
<test.vcloud-director.vapptemplate-id>${test.vcloud-director.vapptemplate-id}</test.vcloud-director.vapptemplate-id>
<test.vcloud-director.network-name>${test.vcloud-director.network-name}</test.vcloud-director.network-name>
<test.vcloud-director.network-id>${test.vcloud-director.network-id}</test.vcloud-director.network-id>
<test.vcloud-director.vdc-id>${test.vcloud-director.vdc-id}</test.vcloud-director.vdc-id>
<test.vcloud-director.user-id>${test.vcloud-director.user-id}</test.vcloud-director.user-id>
</systemPropertyVariables>
</configuration>
</execution>
@ -151,7 +149,7 @@
org.jclouds.compute.internal;version="${project.version}",
org.jclouds.rest.internal;version="${project.version}",
org.jclouds*;version="${project.version}",
*
*
</Import-Package>
</instructions>
</configuration>