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

eip resources have no required properties.

Browse Source
This commit is contained in:
Joseph Lawson 2014-10-21 15:53:38 -04:00
parent 20a69255c3
commit a8b967eab0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
moto/ec2/models.py
View File

@ -1946,13 +1946,15 @@ class ElasticAddress(object):
@classmethod
def create_from_cloudformation_json(cls, resource_name, cloudformation_json):
properties = cloudformation_json['Properties']
properties = cloudformation_json.get('Properties')
instance_id = None
if properties:
eip = ec2_backend.allocate_address(
domain=properties.get('Domain'))
instance_id = properties.get('InstanceId')
else:
eip = ec2_backend.allocate_address()
eip = ec2_backend.allocate_address(
domain=properties['Domain']
)
instance_id = properties.get('InstanceId')
if instance_id:
instance = ec2_backend.get_instance_by_id(instance_id)
ec2_backend.associate_address(instance, address=eip.public_ip)