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

adjusted timeouts and corrected invalid ami id 

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2628 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2010-01-11 02:06:54 +00:00
parent 05a7f5233b
commit 646cad3202
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java
View File

@ -80,7 +80,7 @@ public class EC2ComputeService implements ComputeService {
} }
private Map<Image, String> imageAmiIdMap = ImmutableMap.<Image, String> builder().put( private Map<Image, String> imageAmiIdMap = ImmutableMap.<Image, String> builder().put(
Image.CENTOS_53, "ami-b0a84ad9").put(Image.RHEL_53, "ami-368b685f").build();// todo ami Image.UMBUNTU_90, "ami-7e28ca17").put(Image.RHEL_53, "ami-368b685f").build();// todo ami
// matrix of // matrix of
// region // region
// 32/64 bit // 32/64 bit

1
aws/core/src/main/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClient.java
View File

@ -59,5 +59,6 @@ public interface AvailabilityZoneAndRegionClient {
* @see <a href="http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html" * @see <a href="http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html"
* /> * />
*/ */
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
Map<Region, URI> describeRegions(DescribeRegionsOptions... options); Map<Region, URI> describeRegions(DescribeRegionsOptions... options);
} }

4
aws/demos/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java
View File

@ -95,8 +95,8 @@ public class SpeedTest {
long timeOut = messageCount * 200; // minimum rate should be at least 5/second long timeOut = messageCount * 200; // minimum rate should be at least 5/second
for (Entry<String, RestContext<SQSAsyncClient, SQSClient>> entry : ImmutableMap for (Entry<String, RestContext<SQSAsyncClient, SQSClient>> entry : ImmutableMap
.<String, RestContext<SQSAsyncClient, SQSClient>> of("standard", .<String, RestContext<SQSAsyncClient, SQSClient>> of("enterprise",
nullLoggingDefaultContext, "enterprise", nullLoggingEnterpriseContext) nullLoggingEnterpriseContext, "default", nullLoggingDefaultContext)
.entrySet()) { .entrySet()) {
for (Queue queue : queues) { for (Queue queue : queues) {