diff --git a/labs/carrenza-vcloud-director/pom.xml b/labs/carrenza-vcloud-director/pom.xml
index 5b9fdc7ffb..b2064d1d26 100644
--- a/labs/carrenza-vcloud-director/pom.xml
+++ b/labs/carrenza-vcloud-director/pom.xml
@@ -42,6 +42,12 @@
+
+
+
+
+
+
@@ -52,7 +58,7 @@
org.jclouds.labs
- vcloud-director-director
+ vcloud-director
${project.version}
test-jar
test
@@ -110,6 +116,12 @@
${test.carrenza-vcloud-director.image-id}
${test.carrenza-vcloud-director.image.login-user}
${test.carrenza-vcloud-director.image.authenticate-sudo}
+ ${test.carrenza-vcloud-director.catalog-id}
+ ${test.carrenza-vcloud-director.media-id}
+ ${test.carrenza-vcloud-director.vapptemplate-id}
+ ${test.carrenza-vcloud-director.network-id}
+ ${test.carrenza-vcloud-director.vdc-id}
+ ${test.carrenza-vcloud-director.user-id}
@@ -128,7 +140,7 @@
${project.artifactId}
- org.jclouds.carrenza.vcloud-director*;version="${project.version}"
+ org.jclouds.carrenza.vcloud.director*;version="${project.version}"
org.jclouds.compute.internal;version="${project.version}",
org.jclouds.rest.internal;version="${project.version}",
diff --git a/labs/carrenza-vcloud-director/src/main/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorProviderMetadata.java b/labs/carrenza-vcloud-director/src/main/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorProviderMetadata.java
index 3c75135bd4..27745f8cc0 100644
--- a/labs/carrenza-vcloud-director/src/main/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorProviderMetadata.java
+++ b/labs/carrenza-vcloud-director/src/main/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorProviderMetadata.java
@@ -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 {
- 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")
diff --git a/labs/carrenza-vcloud-director/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/labs/carrenza-vcloud-director/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
index 8577da069b..b59c68cff5 100644
--- a/labs/carrenza-vcloud-director/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ b/labs/carrenza-vcloud-director/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
@@ -1 +1 @@
-org.jclouds.carrenza.element.vcloud.CarrenzaElementVCloudProviderMetadata
+org.jclouds.carrenza.vcloud.director.CarrenzaVCloudDirectorProviderMetadata
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorNonClientOperationsLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorHttpClientLiveTest.java
similarity index 78%
rename from labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorNonClientOperationsLiveTest.java
rename to labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorHttpClientLiveTest.java
index c1054103e3..f3959fa55c 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorNonClientOperationsLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorHttpClientLiveTest.java
@@ -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";
}
}
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorComputeServiceLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorComputeServiceLiveTest.java
index 8a683297ec..229aa922c1 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorComputeServiceLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorComputeServiceLiveTest.java
@@ -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 {
//
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorTemplateBuilderLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorTemplateBuilderLiveTest.java
index dea42c7a04..a197da2d40 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorTemplateBuilderLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorTemplateBuilderLiveTest.java
@@ -21,45 +21,16 @@ package org.jclouds.carrenza.vcloud.director.compute;
import org.testng.annotations.Test;
/**
+ * {@inheritDoc}
*
* @author danikov
+ * @author grkvlt
*/
-@Test(groups = "live", testName = "CarrenzaVCloudDirectorTemplateBuilderLiveTest")
+@Test(groups = { "live", "compute" }, testName = "CarrenzaVCloudDirectorTemplateBuilderLiveTest")
public class CarrenzaVCloudDirectorTemplateBuilderLiveTest {
// BaseTemplateBuilderLiveTest {
//
// public CarrenzaVCloudDirectorTemplateBuilderLiveTest() {
// provider = "carrenza-vcloud-director";
// }
-//
-// @Override
-// protected Predicate defineUnsupportedOperatingSystems() {
-// return new Predicate() {
-//
-// @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 getIso3166Codes() {
-// return ImmutableSet. of("GB-LND");
-// }
}
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorCatalogClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorCatalogClientLiveTest.java
index a31297f65f..c831e457ff 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorCatalogClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorCatalogClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorMediaClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorMediaClientLiveTest.java
index 6c50cfece5..d2ccc72e5c 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorMediaClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorMediaClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorNetworkClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorNetworkClientLiveTest.java
index bd2fd95e09..bc202180f2 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorNetworkClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorNetworkClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorOrgClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorOrgClientLiveTest.java
index 0257fc879d..f722ce554a 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorOrgClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorOrgClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorQueryClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorQueryClientLiveTest.java
index a941813061..ce338d35dc 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorQueryClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorQueryClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorTaskClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorTaskClientLiveTest.java
index 2f7ea669f7..0d67d79260 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorTaskClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorTaskClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorUploadClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorUploadClientLiveTest.java
index 9370962395..900e6982d8 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorUploadClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorUploadClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppClientLiveTest.java
index 0d02238828..f5af2b12e2 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppTemplateClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppTemplateClientLiveTest.java
index cac29c511f..6c272c3497 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppTemplateClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppTemplateClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVdcClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVdcClientLiveTest.java
index d50ab80dfe..1faee1514a 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVdcClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVdcClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminCatalogClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminCatalogClientLiveTest.java
index 01c8f151f6..f4b4611274 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminCatalogClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminCatalogClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminNetworkClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminNetworkClientLiveTest.java
index 681af62394..2fbff2d836 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminNetworkClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminNetworkClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminOrgClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminOrgClientLiveTest.java
index 5381337629..4526a10b75 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminOrgClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminOrgClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminQueryClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminQueryClientLiveTest.java
index 95d47884b8..34fe21f33f 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminQueryClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminQueryClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminVdcClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminVdcClientLiveTest.java
index 73f2b4da45..088269886c 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminVdcClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminVdcClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorGroupClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorGroupClientLiveTest.java
index 14dd740331..3fde581535 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorGroupClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorGroupClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorUserClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorUserClientLiveTest.java
index afbde8565d..ed58c5a613 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorUserClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorUserClientLiveTest.java
@@ -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() {
diff --git a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/login/CarrenzaVCloudDirectorSessionClientLiveTest.java b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/login/CarrenzaVCloudDirectorSessionClientLiveTest.java
index 24685c0d51..ac62c888fb 100644
--- a/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/login/CarrenzaVCloudDirectorSessionClientLiveTest.java
+++ b/labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/login/CarrenzaVCloudDirectorSessionClientLiveTest.java
@@ -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() {
diff --git a/labs/pom.xml b/labs/pom.xml
index c0c4ae9725..60b5dee8da 100644
--- a/labs/pom.xml
+++ b/labs/pom.xml
@@ -40,5 +40,6 @@
aws-elb
savvis-symphonyvpdc
dmtf
+ carrenza-vcloud-director
diff --git a/labs/vcloud-director/pom.xml b/labs/vcloud-director/pom.xml
index 32e12456a7..cf2258d2ce 100644
--- a/labs/vcloud-director/pom.xml
+++ b/labs/vcloud-director/pom.xml
@@ -29,7 +29,7 @@
org.jclouds.labs
vcloud-director
- jcloud vcloud-director api
+ jclouds vcloud-director api
jclouds components to access an implementation of VMware vCloud Director 1.5+
bundle
@@ -42,13 +42,12 @@
- Public
-
+
@@ -122,12 +121,11 @@
${test.vcloud-director.image.login-user}
${test.vcloud-director.image.authenticate-sudo}
${test.vcloud-director.catalog-id}
- ${test.vcloud-director.catalog-name}
${test.vcloud-director.media-id}
${test.vcloud-director.vapptemplate-id}
- ${test.vcloud-director.network-name}
${test.vcloud-director.network-id}
${test.vcloud-director.vdc-id}
+ ${test.vcloud-director.user-id}
@@ -151,7 +149,7 @@
org.jclouds.compute.internal;version="${project.version}",
org.jclouds.rest.internal;version="${project.version}",
org.jclouds*;version="${project.version}",
- *
+ *