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

updated ecloud live test to use ubuntu 10.04

This commit is contained in:
Adrian Cole 2011-06-01 12:07:58 -07:00
parent 281109dfc4
commit f9dbfda92d
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/trmk/src/test/java/org/jclouds/vcloud/terremark/TerremarkClientLiveTest.java
View File

@ -88,14 +88,16 @@ public abstract class TerremarkClientLiveTest extends VCloudExpressClientLiveTes
protected TerremarkVCloudClient tmClient; protected TerremarkVCloudClient tmClient;
protected Factory sshFactory; protected Factory sshFactory;
private String publicIp; protected String publicIp;
private InternetService is; protected InternetService is;
private Node node; protected Node node;
private VCloudExpressVApp vApp; protected VCloudExpressVApp vApp;
private RetryablePredicate<IPSocket> socketTester; protected RetryablePredicate<IPSocket> socketTester;
private RetryablePredicate<URI> successTester; protected RetryablePredicate<URI> successTester;
private VCloudExpressVApp clone; protected Injector injector;
private VDC vdc;
protected VCloudExpressVApp clone;
protected VDC vdc;
public static final String PREFIX = System.getProperty("user.name") + "-terremark"; public static final String PREFIX = System.getProperty("user.name") + "-terremark";
@Test @Test
@ -281,7 +283,7 @@ public abstract class TerremarkClientLiveTest extends VCloudExpressClientLiveTes
loopAndCheckPass(); loopAndCheckPass();
} }
private void loopAndCheckPass() throws IOException { protected void loopAndCheckPass() throws IOException {
for (int i = 0; i < 5; i++) {// retry loop TODO replace with predicate. for (int i = 0; i < 5; i++) {// retry loop TODO replace with predicate.
try { try {
doCheckPass(publicIp); doCheckPass(publicIp);
@ -373,7 +375,7 @@ public abstract class TerremarkClientLiveTest extends VCloudExpressClientLiveTes
loopAndCheckPass(); loopAndCheckPass();
} }
private void verifyConfigurationOfVApp(VCloudExpressVApp vApp, String serverName, String expectedOs, protected void verifyConfigurationOfVApp(VCloudExpressVApp vApp, String serverName, String expectedOs,
int processorCount, long memory, long hardDisk) { int processorCount, long memory, long hardDisk) {
assertEquals(vApp.getName(), serverName); assertEquals(vApp.getName(), serverName);
assertEquals(vApp.getOperatingSystemDescription(), expectedOs); assertEquals(vApp.getOperatingSystemDescription(), expectedOs);
@ -387,7 +389,7 @@ public abstract class TerremarkClientLiveTest extends VCloudExpressClientLiveTes
CIMPredicates.resourceTypeIn(ResourceType.DISK_DRIVE)).getVirtualQuantity().longValue()); CIMPredicates.resourceTypeIn(ResourceType.DISK_DRIVE)).getVirtualQuantity().longValue());
} }
private void doCheckPass(String address) throws IOException { protected void doCheckPass(String address) throws IOException {
IPSocket socket = new IPSocket(address, 22); IPSocket socket = new IPSocket(address, 22);
System.out.printf("%d: %s awaiting ssh service to start%n", System.currentTimeMillis(), socket); System.out.printf("%d: %s awaiting ssh service to start%n", System.currentTimeMillis(), socket);
@ -466,7 +468,7 @@ public abstract class TerremarkClientLiveTest extends VCloudExpressClientLiveTes
setupCredentials(); setupCredentials();
Properties overrides = setupProperties(); Properties overrides = setupProperties();
Injector injector = new RestContextFactory().createContextBuilder(provider, injector = new RestContextFactory().createContextBuilder(provider,
ImmutableSet.<Module> of(new Log4JLoggingModule(), new JschSshClientModule()), overrides) ImmutableSet.<Module> of(new Log4JLoggingModule(), new JschSshClientModule()), overrides)
.buildInjector(); .buildInjector();

6
providers/trmk-ecloud/src/test/java/org/jclouds/vcloud/terremark/TerremarkECloudClientLiveTest.java
View File

@ -44,8 +44,8 @@ public class TerremarkECloudClientLiveTest extends TerremarkClientLiveTest {
@BeforeClass @BeforeClass
void setProvider() { void setProvider() {
this.provider = "trmk-ecloud"; this.provider = "trmk-ecloud";
this.itemName = "Ubuntu 8.04 LTS (x86)"; this.itemName = "Ubuntu Server 10.04 x64";
expectedOs = "Ubuntu Linux (32-bit)"; expectedOs = "Ubuntu Linux (64-bit)";
} }
@Override @Override
@ -55,7 +55,7 @@ public class TerremarkECloudClientLiveTest extends TerremarkClientLiveTest {
@Override @Override
protected SshClient getConnectionFor(IPSocket socket) { protected SshClient getConnectionFor(IPSocket socket) {
return sshFactory.create(socket, new Credentials("ecloud", "$Ep455l0ud!2")); return sshFactory.create(socket, new Credentials("ecloud", "TmrkCl0ud1s#1!"));
} }
@Override @Override