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

aws quick fixies

This commit is contained in:
Adrian Cole 2011-12-19 14:06:37 -08:00
parent 6e20d7c23b
commit 906171c42a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java
View File

@ -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");

7
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java
View File

@ -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();
}
}