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

Fix some merge issues, add block device parsing

Browse Source
This commit is contained in:
Andrew Gross 2014-04-25 15:44:55 -04:00
parent 81a979cd1d
commit dbe17d059f
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moto/autoscaling/models.py
View File

@ -41,8 +41,8 @@ class FakeLaunchConfiguration(object):
self.instance_profile_name = instance_profile_name self.instance_profile_name = instance_profile_name
self.spot_price = spot_price self.spot_price = spot_price
self.ebs_optimized = ebs_optimized self.ebs_optimized = ebs_optimized
<<<<<<< HEAD
self.associate_public_ip_address = associate_public_ip_address self.associate_public_ip_address = associate_public_ip_address
self.block_device_mapping_dict = block_device_mapping_dict
@classmethod @classmethod
def create_from_cloudformation_json(cls, resource_name, cloudformation_json): def create_from_cloudformation_json(cls, resource_name, cloudformation_json):
@ -62,14 +62,13 @@ class FakeLaunchConfiguration(object):
spot_price=properties.get("SpotPrice"), spot_price=properties.get("SpotPrice"),
ebs_optimized=properties.get("EbsOptimized"), ebs_optimized=properties.get("EbsOptimized"),
associate_public_ip_address=properties.get("AssociatePublicIpAddress"), associate_public_ip_address=properties.get("AssociatePublicIpAddress"),
block_device_mappings=properties.get("BlockDeviceMapping.member")
) )
return config return config
@property @property
def physical_resource_id(self): def physical_resource_id(self):
return self.name return self.name
=======
self.block_device_mapping_dict = block_device_mapping_dict
@property @property
def block_device_mappings(self): def block_device_mappings(self):
@ -77,7 +76,6 @@ class FakeLaunchConfiguration(object):
return None return None
else: else:
return self._parse_block_device_mappings() return self._parse_block_device_mappings()
>>>>>>> [Block Device] Add block device mapping to launch config backend
@property @property
def instance_monitoring_enabled(self): def instance_monitoring_enabled(self):
@ -212,11 +210,7 @@ class AutoScalingBackend(BaseBackend):
def create_launch_configuration(self, name, image_id, key_name, def create_launch_configuration(self, name, image_id, key_name,
security_groups, user_data, instance_type, security_groups, user_data, instance_type,
instance_monitoring, instance_profile_name, instance_monitoring, instance_profile_name,
<<<<<<< HEAD spot_price, ebs_optimized, associate_public_ip_address, block_device_mappings):
spot_price, ebs_optimized, associate_public_ip_address):
=======
spot_price, ebs_optimized, block_device_mappings):
>>>>>>> [Block Device] Add block device mapping to launch config backend
launch_configuration = FakeLaunchConfiguration( launch_configuration = FakeLaunchConfiguration(
name=name, name=name,
image_id=image_id, image_id=image_id,
@ -228,11 +222,8 @@ class AutoScalingBackend(BaseBackend):
instance_profile_name=instance_profile_name, instance_profile_name=instance_profile_name,
spot_price=spot_price, spot_price=spot_price,
ebs_optimized=ebs_optimized, ebs_optimized=ebs_optimized,
<<<<<<< HEAD
associate_public_ip_address=associate_public_ip_address, associate_public_ip_address=associate_public_ip_address,
=======
block_device_mapping_dict=block_device_mappings, block_device_mapping_dict=block_device_mappings,
>>>>>>> [Block Device] Add block device mapping to launch config backend
) )
self.launch_configurations[name] = launch_configuration self.launch_configurations[name] = launch_configuration
return launch_configuration return launch_configuration