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

Merge pull request #1335 from captainkerk/rename-autoscaling-internal-methods-to-match-boto

Browse Source 
AutoScalingBackend / Implementation Coverage quirk
This commit is contained in:
Jack Danger 2017-11-12 09:04:02 -08:00 committed by GitHub
commit 5a204993af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
moto/autoscaling/models.py
View File

@ -185,7 +185,7 @@ class FakeAutoScalingGroup(BaseModel):
target_group_arns = properties.get("TargetGroupARNs", []) target_group_arns = properties.get("TargetGroupARNs", [])
backend = autoscaling_backends[region_name] backend = autoscaling_backends[region_name]
group = backend.create_autoscaling_group( group = backend.create_auto_scaling_group(
name=resource_name, name=resource_name,
availability_zones=properties.get("AvailabilityZones", []), availability_zones=properties.get("AvailabilityZones", []),
desired_capacity=properties.get("DesiredCapacity"), desired_capacity=properties.get("DesiredCapacity"),
@ -215,13 +215,13 @@ class FakeAutoScalingGroup(BaseModel):
def delete_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name): def delete_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name):
backend = autoscaling_backends[region_name] backend = autoscaling_backends[region_name]
try: try:
backend.delete_autoscaling_group(resource_name) backend.delete_auto_scaling_group(resource_name)
except KeyError: except KeyError:
pass pass
def delete(self, region_name): def delete(self, region_name):
backend = autoscaling_backends[region_name] backend = autoscaling_backends[region_name]
backend.delete_autoscaling_group(self.name) backend.delete_auto_scaling_group(self.name)
@property @property
def physical_resource_id(self): def physical_resource_id(self):
@ -358,7 +358,7 @@ class AutoScalingBackend(BaseBackend):
def delete_launch_configuration(self, launch_configuration_name): def delete_launch_configuration(self, launch_configuration_name):
self.launch_configurations.pop(launch_configuration_name, None) self.launch_configurations.pop(launch_configuration_name, None)
def create_autoscaling_group(self, name, availability_zones, def create_auto_scaling_group(self, name, availability_zones,
desired_capacity, max_size, min_size, desired_capacity, max_size, min_size,
launch_config_name, vpc_zone_identifier, launch_config_name, vpc_zone_identifier,
default_cooldown, health_check_period, default_cooldown, health_check_period,
@ -402,7 +402,7 @@ class AutoScalingBackend(BaseBackend):
self.update_attached_target_groups(group.name) self.update_attached_target_groups(group.name)
return group return group
def update_autoscaling_group(self, name, availability_zones, def update_auto_scaling_group(self, name, availability_zones,
desired_capacity, max_size, min_size, desired_capacity, max_size, min_size,
launch_config_name, vpc_zone_identifier, launch_config_name, vpc_zone_identifier,
default_cooldown, health_check_period, default_cooldown, health_check_period,
@ -415,18 +415,18 @@ class AutoScalingBackend(BaseBackend):
placement_group, termination_policies) placement_group, termination_policies)
return group return group
def describe_autoscaling_groups(self, names): def describe_auto_scaling_groups(self, names):
groups = self.autoscaling_groups.values() groups = self.autoscaling_groups.values()
if names: if names:
return [group for group in groups if group.name in names] return [group for group in groups if group.name in names]
else: else:
return list(groups) return list(groups)
def delete_autoscaling_group(self, group_name): def delete_auto_scaling_group(self, group_name):
self.set_desired_capacity(group_name, 0) self.set_desired_capacity(group_name, 0)
self.autoscaling_groups.pop(group_name, None) self.autoscaling_groups.pop(group_name, None)
def describe_autoscaling_instances(self): def describe_auto_scaling_instances(self):
instance_states = [] instance_states = []
for group in self.autoscaling_groups.values(): for group in self.autoscaling_groups.values():
instance_states.extend(group.instance_states) instance_states.extend(group.instance_states)

10
moto/autoscaling/responses.py
View File

@ -67,7 +67,7 @@ class AutoScalingResponse(BaseResponse):
return template.render() return template.render()
def create_auto_scaling_group(self): def create_auto_scaling_group(self):
self.autoscaling_backend.create_autoscaling_group( self.autoscaling_backend.create_auto_scaling_group(
name=self._get_param('AutoScalingGroupName'), name=self._get_param('AutoScalingGroupName'),
availability_zones=self._get_multi_param( availability_zones=self._get_multi_param(
'AvailabilityZones.member'), 'AvailabilityZones.member'),
@ -160,7 +160,7 @@ class AutoScalingResponse(BaseResponse):
def describe_auto_scaling_groups(self): def describe_auto_scaling_groups(self):
names = self._get_multi_param("AutoScalingGroupNames.member") names = self._get_multi_param("AutoScalingGroupNames.member")
token = self._get_param("NextToken") token = self._get_param("NextToken")
all_groups = self.autoscaling_backend.describe_autoscaling_groups(names) all_groups = self.autoscaling_backend.describe_auto_scaling_groups(names)
all_names = [group.name for group in all_groups] all_names = [group.name for group in all_groups]
if token: if token:
start = all_names.index(token) + 1 start = all_names.index(token) + 1
@ -177,7 +177,7 @@ class AutoScalingResponse(BaseResponse):
return template.render(groups=groups, next_token=next_token) return template.render(groups=groups, next_token=next_token)
def update_auto_scaling_group(self): def update_auto_scaling_group(self):
self.autoscaling_backend.update_autoscaling_group( self.autoscaling_backend.update_auto_scaling_group(
name=self._get_param('AutoScalingGroupName'), name=self._get_param('AutoScalingGroupName'),
availability_zones=self._get_multi_param( availability_zones=self._get_multi_param(
'AvailabilityZones.member'), 'AvailabilityZones.member'),
@ -198,7 +198,7 @@ class AutoScalingResponse(BaseResponse):
def delete_auto_scaling_group(self): def delete_auto_scaling_group(self):
group_name = self._get_param('AutoScalingGroupName') group_name = self._get_param('AutoScalingGroupName')
self.autoscaling_backend.delete_autoscaling_group(group_name) self.autoscaling_backend.delete_auto_scaling_group(group_name)
template = self.response_template(DELETE_AUTOSCALING_GROUP_TEMPLATE) template = self.response_template(DELETE_AUTOSCALING_GROUP_TEMPLATE)
return template.render() return template.render()
@ -218,7 +218,7 @@ class AutoScalingResponse(BaseResponse):
return template.render() return template.render()
def describe_auto_scaling_instances(self): def describe_auto_scaling_instances(self):
instance_states = self.autoscaling_backend.describe_autoscaling_instances() instance_states = self.autoscaling_backend.describe_auto_scaling_instances()
template = self.response_template( template = self.response_template(
DESCRIBE_AUTOSCALING_INSTANCES_TEMPLATE) DESCRIBE_AUTOSCALING_INSTANCES_TEMPLATE)
return template.render(instance_states=instance_states) return template.render(instance_states=instance_states)