mirror of https://github.com/apache/jclouds.git
aws quick fixies
This commit is contained in:
parent
6e20d7c23b
commit
906171c42a
|
@ -211,7 +211,7 @@ public class AWSEC2TemplateBuilderLiveTest extends EC2TemplateBuilderLiveTest {
|
||||||
System.out.println(fastestTemplate.getImage());
|
System.out.println(fastestTemplate.getImage());
|
||||||
assert (fastestTemplate.getImage().getProviderId().startsWith("ami-")) : fastestTemplate;
|
assert (fastestTemplate.getImage().getProviderId().startsWith("ami-")) : fastestTemplate;
|
||||||
assertEquals(fastestTemplate.getHardware().getProviderId(), InstanceType.CC2_8XLARGE);
|
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().is64Bit(), true);
|
||||||
assertEquals(fastestTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
|
assertEquals(fastestTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
|
||||||
assertEquals(fastestTemplate.getImage().getUserMetadata().get("rootDeviceType"), "ebs");
|
assertEquals(fastestTemplate.getImage().getUserMetadata().get("rootDeviceType"), "ebs");
|
||||||
|
|
|
@ -97,10 +97,13 @@ public class TagClientLiveTest {
|
||||||
context = computeContext.getProviderSpecificContext();
|
context = computeContext.getProviderSpecificContext();
|
||||||
client = context.getApi().getTagServices();
|
client = context.getApi().getTagServices();
|
||||||
try {
|
try {
|
||||||
testGroup = context.getApi().getSecurityGroupServices()
|
testGroup = context.getApi().getSecurityGroupServices().createSecurityGroupInRegionAndReturnId(null,
|
||||||
.createSecurityGroupInRegionAndReturnId(null, "test-group", "test-group");
|
"test-group", "test-group");
|
||||||
} catch (IllegalStateException e) {
|
} catch (IllegalStateException e) {
|
||||||
// already exists
|
// already exists
|
||||||
|
testGroup = Iterables.get(
|
||||||
|
context.getApi().getSecurityGroupServices().describeSecurityGroupsInRegion(null, "test-group"), 0)
|
||||||
|
.getId();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue