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

Merge pull request #535 from beeva-antonioirizar/master

Browse Source 
Add method describe_clusters and fix create_cluster,  list_clusters, list_task_definitions,  list_services for service ecs
This commit is contained in:
Steve Pulec 2016-02-14 16:53:26 -05:00
commit 117a79e103
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
moto/ecs/models.py
View File

@ -117,6 +117,20 @@ class EC2ContainerServiceBackend(BaseBackend):
""" """
return [cluster.arn for cluster in self.clusters.values()] return [cluster.arn for cluster in self.clusters.values()]
def describe_clusters(self, list_clusters_name=None):
list_clusters = []
if list_clusters_name is None:
if 'default' in self.clusters:
list_clusters.append(self.clusters['default'].response_object)
else:
for cluster in list_clusters_name:
cluster_name = cluster.split('/')[-1]
if cluster_name in self.clusters:
list_clusters.append(self.clusters[cluster_name].response_object)
else:
raise Exception("{0} is not a cluster".format(cluster_name))
return list_clusters
def delete_cluster(self, cluster_str): def delete_cluster(self, cluster_str):
cluster_name = cluster_str.split('/')[-1] cluster_name = cluster_str.split('/')[-1]
if cluster_name in self.clusters: if cluster_name in self.clusters:

25
moto/ecs/responses.py
View File

@ -23,6 +23,8 @@ class EC2ContainerServiceResponse(BaseResponse):
def create_cluster(self): def create_cluster(self):
cluster_name = self._get_param('clusterName') cluster_name = self._get_param('clusterName')
if cluster_name is None:
cluster_name = 'default'
cluster = self.ecs_backend.create_cluster(cluster_name) cluster = self.ecs_backend.create_cluster(cluster_name)
return json.dumps({ return json.dumps({
'cluster': cluster.response_object 'cluster': cluster.response_object
@ -31,8 +33,17 @@ class EC2ContainerServiceResponse(BaseResponse):
def list_clusters(self): def list_clusters(self):
cluster_arns = self.ecs_backend.list_clusters() cluster_arns = self.ecs_backend.list_clusters()
return json.dumps({ return json.dumps({
'clusterArns': cluster_arns, 'clusterArns': cluster_arns
'nextToken': str(uuid.uuid1()) #,
#'nextToken': str(uuid.uuid1())
})
def describe_clusters(self):
list_clusters_name = self._get_param('clusters')
clusters = self.ecs_backend.describe_clusters(list_clusters_name)
return json.dumps({
'clusters': clusters,
'failures': []
}) })
def delete_cluster(self): def delete_cluster(self):
@ -54,8 +65,9 @@ class EC2ContainerServiceResponse(BaseResponse):
def list_task_definitions(self): def list_task_definitions(self):
task_definition_arns = self.ecs_backend.list_task_definitions() task_definition_arns = self.ecs_backend.list_task_definitions()
return json.dumps({ return json.dumps({
'taskDefinitionArns': task_definition_arns, 'taskDefinitionArns': task_definition_arns
'nextToken': str(uuid.uuid1()) #,
#'nextToken': str(uuid.uuid1())
}) })
def deregister_task_definition(self): def deregister_task_definition(self):
@ -79,8 +91,9 @@ class EC2ContainerServiceResponse(BaseResponse):
cluster_str = self._get_param('cluster') cluster_str = self._get_param('cluster')
service_arns = self.ecs_backend.list_services(cluster_str) service_arns = self.ecs_backend.list_services(cluster_str)
return json.dumps({ return json.dumps({
'serviceArns': service_arns, 'serviceArns': service_arns
'nextToken': str(uuid.uuid1()) # ,
# 'nextToken': str(uuid.uuid1())
}) })
def update_service(self): def update_service(self):