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

EC2 Windows AMIs have a separate owner (which changed recently) - add this owner ID to the default set. Update WindowsClientLiveTest to use the default set and verify it passes.

This commit is contained in:
Richard Downer 2012-04-25 19:37:19 +03:00
parent f66cd71b49
commit 1a77b194e5
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java
View File

@ -69,13 +69,6 @@ public class WindowsClientLiveTest extends BaseComputeServiceContextLiveTest {
private static final String DEFAULT_INSTANCE = "i-TODO"; private static final String DEFAULT_INSTANCE = "i-TODO";
private static final String DEFAULT_BUCKET = "TODO"; private static final String DEFAULT_BUCKET = "TODO";
@Override
protected Properties setupProperties() {
Properties overrides = super.setupProperties();
overrides.put(EC2Constants.PROPERTY_EC2_AMI_OWNERS, "206029621532"); /* Amazon Owner ID */
return overrides;
}
@Override @Override
@BeforeClass(groups = { "integration", "live" }) @BeforeClass(groups = { "integration", "live" })
public void setupContext() { public void setupContext() {
@ -124,7 +117,7 @@ public class WindowsClientLiveTest extends BaseComputeServiceContextLiveTest {
Template template = computeService.templateBuilder() Template template = computeService.templateBuilder()
.osFamily(OsFamily.WINDOWS) .osFamily(OsFamily.WINDOWS)
.os64Bit(true) .os64Bit(true)
.imageNameMatches("Windows-2008R2-SP1-English-Base-") .imageNameMatches("Windows_Server-2008-R2_SP1-English-64Bit-Base-")
.hardwareId(InstanceType.M1_LARGE) .hardwareId(InstanceType.M1_LARGE)
.options(TemplateOptions.Builder.inboundPorts(3389)) .options(TemplateOptions.Builder.inboundPorts(3389))
.build(); .build();

4
providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
View File

@ -65,9 +65,9 @@ public class AWSEC2ProviderMetadata extends BaseProviderMetadata {
// from stopping->stopped state on an ec2 micro // from stopping->stopped state on an ec2 micro
properties.setProperty(TIMEOUT_NODE_SUSPENDED, 120 * 1000 + ""); properties.setProperty(TIMEOUT_NODE_SUSPENDED, 120 * 1000 + "");
properties.putAll(Region.regionProperties()); properties.putAll(Region.regionProperties());
// amazon, alestic, canonical, and rightscale // Amazon Linux, Amazon Windows, alestic, canonical, and rightscale
properties.setProperty(PROPERTY_EC2_AMI_QUERY, properties.setProperty(PROPERTY_EC2_AMI_QUERY,
"owner-id=137112412989,063491364108,099720109477,411009282317;state=available;image-type=machine"); "owner-id=137112412989,801119661308,063491364108,099720109477,411009282317;state=available;image-type=machine");
// amis that work with the cluster instances // amis that work with the cluster instances
properties.setProperty(PROPERTY_EC2_CC_REGIONS, Region.US_EAST_1); properties.setProperty(PROPERTY_EC2_CC_REGIONS, Region.US_EAST_1);
properties properties