From 906171c42afeddd93a8f3e82cdf46c7cd4537488 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 19 Dec 2011 14:06:37 -0800 Subject: [PATCH] aws quick fixies --- .../aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java | 2 +- .../org/jclouds/aws/ec2/services/TagClientLiveTest.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java index d2d14d33ef..99bdaacc60 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java @@ -211,7 +211,7 @@ public class AWSEC2TemplateBuilderLiveTest extends EC2TemplateBuilderLiveTest { System.out.println(fastestTemplate.getImage()); assert (fastestTemplate.getImage().getProviderId().startsWith("ami-")) : fastestTemplate; assertEquals(fastestTemplate.getHardware().getProviderId(), InstanceType.CC2_8XLARGE); - assertEquals(fastestTemplate.getImage().getOperatingSystem().getVersion(), "12.04"); + assertEquals(fastestTemplate.getImage().getOperatingSystem().getVersion(), "10.04"); assertEquals(fastestTemplate.getImage().getOperatingSystem().is64Bit(), true); assertEquals(fastestTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(fastestTemplate.getImage().getUserMetadata().get("rootDeviceType"), "ebs"); diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java index 2be773d658..88239d4e3c 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java @@ -97,10 +97,13 @@ public class TagClientLiveTest { context = computeContext.getProviderSpecificContext(); client = context.getApi().getTagServices(); try { - testGroup = context.getApi().getSecurityGroupServices() - .createSecurityGroupInRegionAndReturnId(null, "test-group", "test-group"); + testGroup = context.getApi().getSecurityGroupServices().createSecurityGroupInRegionAndReturnId(null, + "test-group", "test-group"); } catch (IllegalStateException e) { // already exists + testGroup = Iterables.get( + context.getApi().getSecurityGroupServices().describeSecurityGroupsInRegion(null, "test-group"), 0) + .getId(); } }