Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support placement when starting new instances

Browse Source
This commit is contained in:
andy 2016-02-10 17:59:48 +00:00
parent ac4ce7d53f
commit 7120b5e4b1
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/ec2/models.py
View File

@ -312,6 +312,7 @@ class Instance(BotoInstance, TaggedEC2Resource):
self.user_data = user_data self.user_data = user_data
self.security_groups = security_groups self.security_groups = security_groups
self.instance_type = kwargs.get("instance_type", "m1.small") self.instance_type = kwargs.get("instance_type", "m1.small")
placement = kwargs.get("placement", None)
self.vpc_id = None self.vpc_id = None
self.subnet_id = kwargs.get("subnet_id") self.subnet_id = kwargs.get("subnet_id")
in_ec2_classic = not bool(self.subnet_id) in_ec2_classic = not bool(self.subnet_id)
@ -343,6 +344,8 @@ class Instance(BotoInstance, TaggedEC2Resource):
subnet = ec2_backend.get_subnet(self.subnet_id) subnet = ec2_backend.get_subnet(self.subnet_id)
self.vpc_id = subnet.vpc_id self.vpc_id = subnet.vpc_id
self._placement.zone = subnet.availability_zone self._placement.zone = subnet.availability_zone
elif placement:
self._placement.zone = placement
else: else:
self._placement.zone = ec2_backend.region_name + 'a' self._placement.zone = ec2_backend.region_name + 'a'

3
moto/ec2/responses/instances.py
View File

@ -26,6 +26,7 @@ class InstanceResponse(BaseResponse):
security_group_ids = self._get_multi_param('SecurityGroupId') security_group_ids = self._get_multi_param('SecurityGroupId')
nics = dict_from_querystring("NetworkInterface", self.querystring) nics = dict_from_querystring("NetworkInterface", self.querystring)
instance_type = self.querystring.get("InstanceType", ["m1.small"])[0] instance_type = self.querystring.get("InstanceType", ["m1.small"])[0]
placement = self.querystring.get("Placement.AvailabilityZone", [None])[0]
subnet_id = self.querystring.get("SubnetId", [None])[0] subnet_id = self.querystring.get("SubnetId", [None])[0]
private_ip = self.querystring.get("PrivateIpAddress", [None])[0] private_ip = self.querystring.get("PrivateIpAddress", [None])[0]
associate_public_ip = self.querystring.get("AssociatePublicIpAddress", [None])[0] associate_public_ip = self.querystring.get("AssociatePublicIpAddress", [None])[0]
@ -33,7 +34,7 @@ class InstanceResponse(BaseResponse):
new_reservation = self.ec2_backend.add_instances( new_reservation = self.ec2_backend.add_instances(
image_id, min_count, user_data, security_group_names, image_id, min_count, user_data, security_group_names,
instance_type=instance_type, subnet_id=subnet_id, instance_type=instance_type, placement=placement, subnet_id=subnet_id,
key_name=key_name, security_group_ids=security_group_ids, key_name=key_name, security_group_ids=security_group_ids,
nics=nics, private_ip=private_ip, associate_public_ip=associate_public_ip) nics=nics, private_ip=private_ip, associate_public_ip=associate_public_ip)

18
tests/test_ec2/test_instances.py
View File

@ -537,6 +537,24 @@ def test_run_instance_with_instance_type():
instance.instance_type.should.equal("t1.micro") instance.instance_type.should.equal("t1.micro")
@mock_ec2
def test_run_instance_with_default_placement():
conn = boto.connect_ec2('the_key', 'the_secret')
reservation = conn.run_instances('ami-1234abcd')
instance = reservation.instances[0]
instance.placement.should.equal("us-east-1a")
@mock_ec2
def test_run_instance_with_placement():
conn = boto.connect_ec2('the_key', 'the_secret')
reservation = conn.run_instances('ami-1234abcd', placement="us-east-1b")
instance = reservation.instances[0]
instance.placement.should.equal("us-east-1b")
@mock_ec2 @mock_ec2
def test_run_instance_with_subnet(): def test_run_instance_with_subnet():
conn = boto.connect_vpc('the_key', 'the_secret') conn = boto.connect_vpc('the_key', 'the_secret')