mirror of https://github.com/apache/jclouds.git
Merge pull request #249 from aplowe/master
Fixing problem during configuration of TerremarkECloudClientLiveTest and TerremarkVCloudExpressClientLiveTest
This commit is contained in:
commit
a221e5131e
|
@ -107,6 +107,10 @@ public abstract class TerremarkClientLiveTest extends BaseVersionedServiceLiveTe
|
|||
protected VDC vdc;
|
||||
public static final String PREFIX = System.getProperty("user.name") + "-terremark";
|
||||
|
||||
public TerremarkClientLiveTest() {
|
||||
this.provider = "trmk-vcloudexpress";
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testKeysList() throws Exception {
|
||||
for (Org org : orgs) {
|
||||
|
@ -456,12 +460,6 @@ public abstract class TerremarkClientLiveTest extends BaseVersionedServiceLiveTe
|
|||
|
||||
}
|
||||
|
||||
protected String provider = "trmk-vcloudexpress";
|
||||
protected String identity;
|
||||
protected String credential;
|
||||
protected String endpoint;
|
||||
protected String apiversion;
|
||||
|
||||
@BeforeGroups(groups = { "live" })
|
||||
public void setupClient() {
|
||||
setupCredentials();
|
||||
|
|
|
@ -44,6 +44,13 @@ import org.testng.annotations.Test;
|
|||
*/
|
||||
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "TerremarkECloudClientLiveTest")
|
||||
public class TerremarkECloudClientLiveTest extends TerremarkClientLiveTest {
|
||||
|
||||
public TerremarkECloudClientLiveTest() {
|
||||
this.provider = "trmk-ecloud";
|
||||
this.itemName = "Ubuntu Server 10.04 x64";
|
||||
this.expectedOs = "Ubuntu Linux (64-bit)";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Properties setupProperties() {
|
||||
Properties props = super.setupProperties();
|
||||
|
@ -52,13 +59,6 @@ public class TerremarkECloudClientLiveTest extends TerremarkClientLiveTest {
|
|||
return props;
|
||||
}
|
||||
|
||||
@BeforeClass
|
||||
void setProvider() {
|
||||
this.provider = "trmk-ecloud";
|
||||
this.itemName = "Ubuntu Server 10.04 x64";
|
||||
expectedOs = "Ubuntu Linux (64-bit)";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected InstantiateVAppTemplateOptions createInstantiateOptions() {
|
||||
return processorCount(1).memory(512);
|
||||
|
|
Loading…
Reference in New Issue