From 5edf51e9973778a532e0258a48bbdfeb43291dac Mon Sep 17 00:00:00 2001 From: Tim Anderegg Date: Wed, 19 Oct 2016 13:41:47 -0400 Subject: [PATCH 1/3] Add support for MESOS container type --- marathon/models/container.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marathon/models/container.py b/marathon/models/container.py index 286730e..ad254db 100644 --- a/marathon/models/container.py +++ b/marathon/models/container.py @@ -15,7 +15,7 @@ class MarathonContainer(MarathonObject): :type volumes: list[:class:`marathon.models.container.MarathonContainerVolume`] or list[dict] """ - TYPES = ['DOCKER'] + TYPES = ['DOCKER', 'MESOS'] """Valid container types""" def __init__(self, docker=None, type='DOCKER', volumes=None): From e91ff0999f4cc54deb79ae52328f68f95e82705b Mon Sep 17 00:00:00 2001 From: Tim Anderegg Date: Wed, 19 Oct 2016 13:52:25 -0400 Subject: [PATCH 2/3] Check for docker==None --- marathon/models/container.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/marathon/models/container.py b/marathon/models/container.py index ad254db..17411e7 100644 --- a/marathon/models/container.py +++ b/marathon/models/container.py @@ -22,8 +22,11 @@ def __init__(self, docker=None, type='DOCKER', volumes=None): if type not in self.TYPES: raise InvalidChoiceError('type', type, self.TYPES) self.type = type - self.docker = docker if isinstance(docker, MarathonDockerContainer) \ - else MarathonDockerContainer().from_json(docker) + + if docker: + self.docker = docker if isinstance(docker, MarathonDockerContainer) \ + else MarathonDockerContainer().from_json(docker) + self.volumes = [ v if isinstance( v, MarathonContainerVolume) else MarathonContainerVolume().from_json(v) From 9f2479dfe0ad97d84ebab3cdac492f08bdfd357e Mon Sep 17 00:00:00 2001 From: Tim Anderegg Date: Wed, 19 Oct 2016 15:27:20 -0400 Subject: [PATCH 3/3] Removed whitespace to comply with pep8 --- marathon/models/container.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marathon/models/container.py b/marathon/models/container.py index 17411e7..bb9520b 100644 --- a/marathon/models/container.py +++ b/marathon/models/container.py @@ -22,7 +22,7 @@ def __init__(self, docker=None, type='DOCKER', volumes=None): if type not in self.TYPES: raise InvalidChoiceError('type', type, self.TYPES) self.type = type - + if docker: self.docker = docker if isinstance(docker, MarathonDockerContainer) \ else MarathonDockerContainer().from_json(docker)