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

Better defaults for AMIs.

Browse Source
This commit is contained in:
Steve Pulec 2016-05-11 18:28:34 -04:00
parent 0a09d5231e
commit 076a6a7055
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moto/ec2/models.py
View File

@ -334,7 +334,6 @@ class NetworkInterfaceBackend(object):
return generic_filter(filters, enis) return generic_filter(filters, enis)
class Instance(BotoInstance, TaggedEC2Resource): class Instance(BotoInstance, TaggedEC2Resource):
def __init__(self, ec2_backend, image_id, user_data, security_groups, **kwargs): def __init__(self, ec2_backend, image_id, user_data, security_groups, **kwargs):
super(Instance, self).__init__() super(Instance, self).__init__()
@ -906,6 +905,12 @@ class Ami(TaggedEC2Resource):
self.ec2_backend = ec2_backend self.ec2_backend = ec2_backend
self.id = ami_id self.id = ami_id
self.state = "available" self.state = "available"
self.name = name
self.description = description
self.virtualization_type = None
self.architecture = None
self.kernel_id = None
self.platform = None
if instance: if instance:
self.instance = instance self.instance = instance
@ -914,8 +919,6 @@ class Ami(TaggedEC2Resource):
self.architecture = instance.architecture self.architecture = instance.architecture
self.kernel_id = instance.kernel self.kernel_id = instance.kernel
self.platform = instance.platform self.platform = instance.platform
self.name = name
self.description = description
elif source_ami: elif source_ami:
""" """
@ -927,8 +930,10 @@ class Ami(TaggedEC2Resource):
self.architecture = source_ami.architecture self.architecture = source_ami.architecture
self.kernel_id = source_ami.kernel_id self.kernel_id = source_ami.kernel_id
self.platform = source_ami.platform self.platform = source_ami.platform
self.name = name if name else source_ami.name if not name:
self.description = description if description else source_ami.description self.name = source_ami.name
if not description:
self.description = source_ami.description
self.launch_permission_groups = set() self.launch_permission_groups = set()
self.launch_permission_users = set() self.launch_permission_users = set()