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

corrected timeout in terremark; cleanup

This commit is contained in:
Adrian Cole 2010-04-19 14:49:17 -04:00
parent 597a3d97c2
commit eda0eebfb5
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compute/src/main/java/org/jclouds/compute/options/GetNodesOptions.java
View File

@ -1,7 +1,5 @@
package org.jclouds.compute.options; package org.jclouds.compute.options;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* @author Ivan Meredith * @author Ivan Meredith

1
compute/src/main/java/org/jclouds/compute/util/ComputeUtils.java
View File

@ -218,6 +218,7 @@ public class ComputeUtils {
node.getId())); node.getId()));
} }
@SuppressWarnings("unchecked")
public <T> Map<SshCallable<?>, T> transform(Map<SshCallable<?>, ListenableFuture<?>> responses) { public <T> Map<SshCallable<?>, T> transform(Map<SshCallable<?>, ListenableFuture<?>> responses) {
Map<SshCallable<?>, T> actualResponses = Maps.newHashMap(); Map<SshCallable<?>, T> actualResponses = Maps.newHashMap();
for (Map.Entry<SshCallable<?>, ListenableFuture<?>> entry : responses.entrySet()) { for (Map.Entry<SshCallable<?>, ListenableFuture<?>> entry : responses.entrySet()) {

3
vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java
View File

@ -46,7 +46,7 @@ import org.jclouds.vcloud.terremark.options.AddNodeOptions;
* @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" /> * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 90, timeUnit = TimeUnit.SECONDS) @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface TerremarkVCloudClient extends VCloudClient { public interface TerremarkVCloudClient extends VCloudClient {
/** /**
@ -129,7 +129,6 @@ public interface TerremarkVCloudClient extends VCloudClient {
void deleteNode(int nodeId); void deleteNode(int nodeId);
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
SortedSet<Node> getNodes(int internetServiceId); SortedSet<Node> getNodes(int internetServiceId);
SortedSet<IpAddress> getIpAddressesForNetwork(String networkId); SortedSet<IpAddress> getIpAddressesForNetwork(String networkId);

6
vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java
View File

@ -156,7 +156,11 @@ public class TerremarkVCloudClientLiveTest extends VCloudClientLiveTest {
@Test @Test
public void testInstantiateAndPowerOn() throws InterruptedException, ExecutionException, public void testInstantiateAndPowerOn() throws InterruptedException, ExecutionException,
TimeoutException, IOException { TimeoutException, IOException {
String serverName = "adriantest"; StringBuffer name = new StringBuffer();
for (int i = 0; i < 15; i++)
name.append("a");
String serverName = name.toString();// "adriantest";
long hardDisk = 4194304; long hardDisk = 4194304;
String expectedOs = "Ubuntu Linux (32-bit)"; String expectedOs = "Ubuntu Linux (32-bit)";