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

non-working live tests is disabled (they are not working due to the issues with OpenStack)

This commit is contained in:
Dmitri Babaev 2011-06-03 03:09:43 +04:00
parent 07e6088bdb
commit bde692ab7c
4 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/NovaComputeServiceLiveTest.java
View File

@ -392,7 +392,7 @@ public class NovaComputeServiceLiveTest extends ComputeBase {
assertEquals(provider.getParent(), null); assertEquals(provider.getParent(), null);
} }
@Test(timeOut = 60000) @Test(timeOut = 60000, enabled = false)
public void testListHardwareProfiles() throws Exception { public void testListHardwareProfiles() throws Exception {
//TODO: failing, OpenStack returns a hardware with 0 CPU cores //TODO: failing, OpenStack returns a hardware with 0 CPU cores
for (Hardware hardware : computeService.listHardwareProfiles()) { for (Hardware hardware : computeService.listHardwareProfiles()) {

2
apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ServiceActionsLiveTest.java
View File

@ -56,7 +56,7 @@ public class ServiceActionsLiveTest extends ComputeBase {
//testGetNodeMetadata(); //testGetNodeMetadata();
} }
@Test @Test(enabled = false)
public void testSuspendResume() throws Exception { public void testSuspendResume() throws Exception {
//TODO: failing, suspend is not supported by the nova provider yet //TODO: failing, suspend is not supported by the nova provider yet
getDefaultNodeImmediately(group); getDefaultNodeImmediately(group);

15
apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ClientBase.java
View File

@ -118,19 +118,4 @@ public class ClientBase {
Thread.sleep(1000); Thread.sleep(1000);
} }
} }
protected void awaitForSshPort(String address, Credentials credentials) throws URISyntaxException {
IPSocket socket = new IPSocket(address, 22);
JschSshClient ssh = new JschSshClient(
new BackoffLimitedRetryHandler(), socket, 10000, credentials.identity, null, credentials.credential.getBytes());
while (true) {
try {
System.out.println("ping: " + socket);
ssh.connect();
return;
} catch (SshException ignore) {
}
}
}
} }

18
apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/NovaClientLiveTest.java
View File

@ -55,7 +55,7 @@ public class NovaClientLiveTest extends ClientBase {
assertTrue(initialContainerCount >= 0); assertTrue(initialContainerCount >= 0);
} }
@Test @Test(enabled = false)
public void testListServersDetail() throws Exception { public void testListServersDetail() throws Exception {
//TODO: failing, /v1.1/servers/{server id}/ips URL is not available (issue in the OpenStack) //TODO: failing, /v1.1/servers/{server id}/ips URL is not available (issue in the OpenStack)
Set<Server> response = client.listServers(withDetails()); Set<Server> response = client.listServers(withDetails());
@ -64,7 +64,7 @@ public class NovaClientLiveTest extends ClientBase {
assertTrue(initialContainerCount >= 0); assertTrue(initialContainerCount >= 0);
} }
@Test @Test(enabled = false)
public void testListImages() throws Exception { public void testListImages() throws Exception {
//TODO: failing, image name should not be null (issue in the OpenStack) //TODO: failing, image name should not be null (issue in the OpenStack)
Set<Image> response = client.listImages(); Set<Image> response = client.listImages();
@ -78,7 +78,7 @@ public class NovaClientLiveTest extends ClientBase {
} }
@Test @Test(enabled = false)
public void testListImagesDetail() throws Exception { public void testListImagesDetail() throws Exception {
//TODO: failing, image name should not be null (issue in the OpenStack) //TODO: failing, image name should not be null (issue in the OpenStack)
Set<Image> response = client.listImages(withDetails()); Set<Image> response = client.listImages(withDetails());
@ -248,7 +248,6 @@ public class NovaClientLiveTest extends ClientBase {
assert server.getProgress() >= 0 : "newDetails.getProgress()" + server.getProgress(); assert server.getProgress() >= 0 : "newDetails.getProgress()" + server.getProgress();
} }
private void assertPassword(Server server, String pass) throws IOException { private void assertPassword(Server server, String pass) throws IOException {
IPSocket socket = new IPSocket(Iterables.get(server.getAddresses().getPublicAddresses(), 0).getAddress(), 22); IPSocket socket = new IPSocket(Iterables.get(server.getAddresses().getPublicAddresses(), 0).getAddress(), 22);
//socketTester.apply(socket); //socketTester.apply(socket);
@ -275,18 +274,19 @@ public class NovaClientLiveTest extends ClientBase {
assertEquals(oldName + "new", client.getServer(serverId).getName()); assertEquals(oldName + "new", client.getServer(serverId).getName());
} }
@Test(enabled = true, timeOut = 5 * 60 * 1000) @Test(enabled = false, timeOut = 5 * 60 * 1000)
public void testChangePassword() throws Exception { public void testChangePassword() throws Exception {
//TODO: failing, fix acceptPassword method logic, however password is not changed by OpenStack
int serverId = getDefaultServerImmediately().getId(); int serverId = getDefaultServerImmediately().getId();
blockUntilServerActive(serverId); blockUntilServerActive(serverId);
blockUntilPublicAddress(serverId); blockUntilPublicAddress(serverId);
awaitForSshPort(Iterables.get(client.getServer(serverId).getAddresses().getPublicAddresses(), 0).getAddress(), new Credentials("root", keyPair.get("private")));
client.changeAdminPass(serverId, "elmo"); client.changeAdminPass(serverId, "elmo");
//TODO: wait until SSH is available
assertPassword(client.getServer(serverId), "elmo"); assertPassword(client.getServer(serverId), "elmo");
} }
@Test(enabled = true, timeOut = 10 * 600 * 1000) @Test(enabled = false, timeOut = 10 * 600 * 1000)
public void testCreateImage() throws Exception { public void testCreateImage() throws Exception {
//TODO: failing, create image from instance returns incorrect JSON //TODO: failing, create image from instance returns incorrect JSON
Server server = getDefaultServerImmediately(); Server server = getDefaultServerImmediately();
@ -297,7 +297,7 @@ public class NovaClientLiveTest extends ClientBase {
} }
@Test(enabled = true, timeOut = 10 * 60 * 1000) @Test(enabled = false, timeOut = 10 * 60 * 1000)
public void testRebuildServer() throws Exception { public void testRebuildServer() throws Exception {
//TODO: failing, create image from instance returns incorrect JSON //TODO: failing, create image from instance returns incorrect JSON
Server server = getDefaultServerImmediately(); Server server = getDefaultServerImmediately();
@ -354,7 +354,7 @@ public class NovaClientLiveTest extends ClientBase {
waitServerDeleted(serverId); waitServerDeleted(serverId);
} }
@Test(enabled = true, timeOut = 60000) @Test(enabled = false, timeOut = 60000)
void testDeleteImage() throws Exception { void testDeleteImage() throws Exception {
//TODO: failing, create image from instance returns incorrect JSON //TODO: failing, create image from instance returns incorrect JSON
Image image = getDefaultImageImmediately(getDefaultServerImmediately()); Image image = getDefaultImageImmediately(getDefaultServerImmediately());