mirror of https://github.com/apache/jclouds.git
Updated Carrenza provider
This commit is contained in:
parent
190a28ba16
commit
ee9a659b7e
|
@ -42,6 +42,12 @@
|
||||||
<test.carrenza-vcloud-director.image-id></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.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.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>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -52,7 +58,7 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jclouds.labs</groupId>
|
<groupId>org.jclouds.labs</groupId>
|
||||||
<artifactId>vcloud-director-director</artifactId>
|
<artifactId>vcloud-director</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
<type>test-jar</type>
|
<type>test-jar</type>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
|
@ -110,6 +116,12 @@
|
||||||
<test.carrenza-vcloud-director.image-id>${test.carrenza-vcloud-director.image-id}</test.carrenza-vcloud-director.image-id>
|
<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.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.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>
|
</systemPropertyVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
@ -128,7 +140,7 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<instructions>
|
<instructions>
|
||||||
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
|
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
|
||||||
<Export-Package>org.jclouds.carrenza.vcloud-director*;version="${project.version}"</Export-Package>
|
<Export-Package>org.jclouds.carrenza.vcloud.director*;version="${project.version}"</Export-Package>
|
||||||
<Import-Package>
|
<Import-Package>
|
||||||
org.jclouds.compute.internal;version="${project.version}",
|
org.jclouds.compute.internal;version="${project.version}",
|
||||||
org.jclouds.rest.internal;version="${project.version}",
|
org.jclouds.rest.internal;version="${project.version}",
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
package org.jclouds.carrenza.vcloud.director;
|
package org.jclouds.carrenza.vcloud.director;
|
||||||
|
|
||||||
import static org.jclouds.Constants.PROPERTY_BUILD_VERSION;
|
import static org.jclouds.Constants.PROPERTY_BUILD_VERSION;
|
||||||
|
import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.*;
|
||||||
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
@ -33,9 +34,10 @@ import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient;
|
||||||
import com.google.common.reflect.TypeToken;
|
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 Adrian Cole
|
||||||
|
* @author grkvlt@apache.org
|
||||||
*/
|
*/
|
||||||
public class CarrenzaVCloudDirectorProviderMetadata
|
public class CarrenzaVCloudDirectorProviderMetadata
|
||||||
extends
|
extends
|
||||||
|
@ -60,19 +62,20 @@ public class CarrenzaVCloudDirectorProviderMetadata
|
||||||
|
|
||||||
protected static Properties defaultProperties() {
|
protected static Properties defaultProperties() {
|
||||||
Properties properties = new Properties();
|
Properties properties = new Properties();
|
||||||
properties.setProperty(PROPERTY_BUILD_VERSION, "???"); //FIXME
|
properties.setProperty(PROPERTY_BUILD_VERSION, "1.5.0.464915");
|
||||||
// properties.setProperty(PROPERTY_VCLOUD_DEFAULT_NETWORK, "orgNet-.*-External"); FIXME: needed?
|
properties.setProperty(PROPERTY_VCLOUD_DIRECTOR_DEFAULT_NETWORK, "orgNet-.*-External");
|
||||||
return properties;
|
return properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Builder extends BaseProviderMetadata.Builder<VCloudDirectorClient, VCloudDirectorAsyncClient, VCloudDirectorContext, VCloudDirectorApiMetadata> {
|
public static class Builder extends BaseProviderMetadata.Builder<VCloudDirectorClient, VCloudDirectorAsyncClient, VCloudDirectorContext, VCloudDirectorApiMetadata> {
|
||||||
|
|
||||||
protected Builder(){
|
protected Builder() {
|
||||||
id("carrenza-vcloud-director")
|
id("carrenza-vcloud-director")
|
||||||
.name("Carrenza vCloud Director")
|
.name("Carrenza vCloud Director")
|
||||||
.apiMetadata(new VCloudDirectorApiMetadata().toBuilder()
|
.apiMetadata(new VCloudDirectorApiMetadata().toBuilder()
|
||||||
.buildVersion("1.5.0.464915")
|
.buildVersion("1.5.0.464915")
|
||||||
.contextBuilder(TypeToken.of(CarrenzaVCloudDirectorContextBuilder.class)).build())
|
.contextBuilder(TypeToken.of(CarrenzaVCloudDirectorContextBuilder.class))
|
||||||
|
.build())
|
||||||
.homepage(URI.create("http://carrenza.com/"))
|
.homepage(URI.create("http://carrenza.com/"))
|
||||||
.console(URI.create("https://myvdc.carrenza.net/cloud/org/YOUR_ORG_HERE"))
|
.console(URI.create("https://myvdc.carrenza.net/cloud/org/YOUR_ORG_HERE"))
|
||||||
.iso3166Codes("GB-LND")
|
.iso3166Codes("GB-LND")
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
org.jclouds.carrenza.element.vcloud.CarrenzaElementVCloudProviderMetadata
|
org.jclouds.carrenza.vcloud.director.CarrenzaVCloudDirectorProviderMetadata
|
||||||
|
|
|
@ -22,14 +22,15 @@ import org.jclouds.vcloud.director.v1_5.HttpClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @author danikov
|
||||||
|
* @author grkvlt
|
||||||
*/
|
*/
|
||||||
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "CarrenzaVCloudDirectorNonClientOperationsLiveTest")
|
@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorHttpClientLiveTest")
|
||||||
public class CarrenzaVCloudDirectorNonClientOperationsLiveTest extends HttpClientLiveTest {
|
public class CarrenzaVCloudDirectorHttpClientLiveTest extends HttpClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorNonClientOperationsLiveTest() {
|
public CarrenzaVCloudDirectorHttpClientLiveTest() {
|
||||||
provider = "carrenza-vcloud-director";
|
provider = "carrenza-vcloud-director";
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -21,11 +21,12 @@ package org.jclouds.carrenza.vcloud.director.compute;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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
|
public class CarrenzaVCloudDirectorComputeServiceLiveTest { // FIXME: enable when compute service done
|
||||||
// extends VCloudDirectorComputeServiceLiveTest {
|
// extends VCloudDirectorComputeServiceLiveTest {
|
||||||
//
|
//
|
||||||
|
|
|
@ -21,45 +21,16 @@ package org.jclouds.carrenza.vcloud.director.compute;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @author danikov
|
||||||
|
* @author grkvlt
|
||||||
*/
|
*/
|
||||||
@Test(groups = "live", testName = "CarrenzaVCloudDirectorTemplateBuilderLiveTest")
|
@Test(groups = { "live", "compute" }, testName = "CarrenzaVCloudDirectorTemplateBuilderLiveTest")
|
||||||
public class CarrenzaVCloudDirectorTemplateBuilderLiveTest {
|
public class CarrenzaVCloudDirectorTemplateBuilderLiveTest {
|
||||||
// BaseTemplateBuilderLiveTest<VCloudDirectorClient, VCloudDirectorAsyncClient, VCloudDirectorContext> {
|
// BaseTemplateBuilderLiveTest<VCloudDirectorClient, VCloudDirectorAsyncClient, VCloudDirectorContext> {
|
||||||
//
|
//
|
||||||
// public CarrenzaVCloudDirectorTemplateBuilderLiveTest() {
|
// public CarrenzaVCloudDirectorTemplateBuilderLiveTest() {
|
||||||
// provider = "carrenza-vcloud-director";
|
// 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");
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.CatalogClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorCatalogClientLiveTest extends CatalogClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorCatalogClientLiveTest() {
|
public CarrenzaVCloudDirectorCatalogClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.MediaClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorMediaClientLiveTest extends MediaClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorMediaClientLiveTest() {
|
public CarrenzaVCloudDirectorMediaClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.NetworkClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorNetworkClientLiveTest extends NetworkClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorNetworkClientLiveTest() {
|
public CarrenzaVCloudDirectorNetworkClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.OrgClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorOrgClientLiveTest extends OrgClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorOrgClientLiveTest() {
|
public CarrenzaVCloudDirectorOrgClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.QueryClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorQueryClientLiveTest extends QueryClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorQueryClientLiveTest() {
|
public CarrenzaVCloudDirectorQueryClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.TaskClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
*
|
* @author danikov
|
||||||
* @author Adrian Cole
|
* @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 class CarrenzaVCloudDirectorTaskClientLiveTest extends TaskClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorTaskClientLiveTest() {
|
public CarrenzaVCloudDirectorTaskClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.UploadClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorUploadClientLiveTest extends UploadClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorUploadClientLiveTest() {
|
public CarrenzaVCloudDirectorUploadClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.VAppClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorVAppClientLiveTest extends VAppClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorVAppClientLiveTest() {
|
public CarrenzaVCloudDirectorVAppClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.VAppTemplateClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
*
|
* @author danikov
|
||||||
* @author Adrian Cole
|
* @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 class CarrenzaVCloudDirectorVAppTemplateClientLiveTest extends VAppTemplateClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorVAppTemplateClientLiveTest() {
|
public CarrenzaVCloudDirectorVAppTemplateClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.VdcClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorVdcClientLiveTest extends VdcClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorVdcClientLiveTest() {
|
public CarrenzaVCloudDirectorVdcClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClientLiveTes
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorAdminCatalogClientLiveTest extends AdminCatalogClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorAdminCatalogClientLiveTest() {
|
public CarrenzaVCloudDirectorAdminCatalogClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClientLiveTes
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorAdminNetworkClientLiveTest extends AdminNetworkClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorAdminNetworkClientLiveTest() {
|
public CarrenzaVCloudDirectorAdminNetworkClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorAdminOrgClientLiveTest extends AdminOrgClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorAdminOrgClientLiveTest() {
|
public CarrenzaVCloudDirectorAdminOrgClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorAdminQueryClientLiveTest extends AdminQueryClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorAdminQueryClientLiveTest() {
|
public CarrenzaVCloudDirectorAdminQueryClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorAdminVdcClientLiveTest extends AdminVdcClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorAdminVdcClientLiveTest() {
|
public CarrenzaVCloudDirectorAdminVdcClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.GroupClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorGroupClientLiveTest extends GroupClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorGroupClientLiveTest() {
|
public CarrenzaVCloudDirectorGroupClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.features.admin.UserClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorUserClientLiveTest extends UserClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorUserClientLiveTest() {
|
public CarrenzaVCloudDirectorUserClientLiveTest() {
|
||||||
|
|
|
@ -22,11 +22,12 @@ import org.jclouds.vcloud.director.v1_5.login.SessionClientLiveTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* {@inheritDoc}
|
||||||
*
|
*
|
||||||
* @author danikov
|
* @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 class CarrenzaVCloudDirectorSessionClientLiveTest extends SessionClientLiveTest {
|
||||||
|
|
||||||
public CarrenzaVCloudDirectorSessionClientLiveTest() {
|
public CarrenzaVCloudDirectorSessionClientLiveTest() {
|
||||||
|
|
|
@ -40,5 +40,6 @@
|
||||||
<module>aws-elb</module>
|
<module>aws-elb</module>
|
||||||
<module>savvis-symphonyvpdc</module>
|
<module>savvis-symphonyvpdc</module>
|
||||||
<module>dmtf</module>
|
<module>dmtf</module>
|
||||||
|
<module>carrenza-vcloud-director</module>
|
||||||
</modules>
|
</modules>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.jclouds.labs</groupId>
|
<groupId>org.jclouds.labs</groupId>
|
||||||
<artifactId>vcloud-director</artifactId>
|
<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>
|
<description>jclouds components to access an implementation of VMware vCloud Director 1.5+</description>
|
||||||
<packaging>bundle</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
|
@ -42,13 +42,12 @@
|
||||||
<test.vcloud-director.image-id></test.vcloud-director.image-id>
|
<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.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.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.catalog-id></test.vcloud-director.catalog-id>
|
||||||
<test.vcloud-director.media-id></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.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.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.vdc-id>
|
||||||
|
<test.vcloud-director.user-id></test.vcloud-director.user-id>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<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.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.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-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.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.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.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.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>
|
</systemPropertyVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
@ -151,7 +149,7 @@
|
||||||
org.jclouds.compute.internal;version="${project.version}",
|
org.jclouds.compute.internal;version="${project.version}",
|
||||||
org.jclouds.rest.internal;version="${project.version}",
|
org.jclouds.rest.internal;version="${project.version}",
|
||||||
org.jclouds*;version="${project.version}",
|
org.jclouds*;version="${project.version}",
|
||||||
*
|
*
|
||||||
</Import-Package>
|
</Import-Package>
|
||||||
</instructions>
|
</instructions>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
Loading…
Reference in New Issue