From a6d481f88afebe6403ce41cf67c602b25c4d2dcb Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 14 Oct 2011 02:36:28 -0700 Subject: [PATCH] changed to use spot instances in us-west-1 due to connect failures trying to ssh across the atlantic --- .../aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java | 2 +- .../org/jclouds/aws/ec2/services/AMIClientLiveTest.java | 2 +- .../aws/ec2/services/SpotInstanceClientLiveTest.java | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java index 9417c00bca..ac48ca5c89 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java @@ -79,7 +79,7 @@ public class AWSEC2ComputeServiceLiveTest extends EC2ComputeServiceLiveTest { @Test(dependsOnMethods = "testCompareSizes") public void testExtendedOptionsAndLogin() throws Exception { // note that this is sensitive to regions that quickly fill spot requests - String region = "eu-west-1"; + String region = "us-west-1"; AWSSecurityGroupClient securityGroupClient = AWSEC2Client.class.cast(context.getProviderSpecificContext().getApi()) .getSecurityGroupServices(); diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java index e768a2dc4a..34f71b2afb 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java @@ -144,7 +144,7 @@ public class AMIClientLiveTest { .put("root-device-type", "ebs")// .build()).ownedBy("137112412989", "099720109477")); assertNotNull(twoResults); - assertEquals(twoResults.size(), 32); + assertEquals(twoResults.size(), 35); } @Test(enabled = false) diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java index 2af459fde8..92271fa1c2 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java @@ -139,7 +139,8 @@ public class SpotInstanceClientLiveTest { for (Spot spot : spots) { assert spot.getSpotPrice() > 0 : spots; assertEquals(spot.getRegion(), region); - assert in(ImmutableSet.of("Linux/UNIX", "SUSE Linux", "Windows")).apply(spot.getProductDescription()) : spot; + assert in(ImmutableSet.of("Linux/UNIX", "SUSE Linux", "Windows", "Windows (Amazon VPC)")).apply( + spot.getProductDescription()) : spot; assert in( ImmutableSet.of("c1.medium", "c1.xlarge", "cc1.4xlarge", "cg1.4xlarge", "m1.large", "m1.small", "m1.xlarge", "m2.2xlarge", "m2.4xlarge", "m2.xlarge", "t1.micro")).apply( @@ -162,10 +163,10 @@ public class SpotInstanceClientLiveTest { start = System.currentTimeMillis(); requests = client.getSpotInstanceServices().requestSpotInstancesInRegion( - "eu-west-1", + "us-west-1", 0.09f, 1, - LaunchSpecification.builder().imageId("ami-24506250").instanceType(InstanceType.M1_SMALL).build(), + LaunchSpecification.builder().imageId("ami-951945d0").instanceType(InstanceType.M1_SMALL).build(), launchGroup(launchGroup).availabilityZoneGroup(launchGroup).validFrom( new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(2))).validUntil( new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(SPOT_DELAY_SECONDS))));