Skip to content

Possibility to send the full object to Marathon on update #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbabineau merged 1 commit into from
Mar 10, 2015
Merged

Possibility to send the full object to Marathon on update #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions marathon/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def get_app(self, app_id, embed_tasks=False):
response = self._do_request('GET', '/v2/apps/{app_id}'.format(app_id=app_id), params=params)
return self._parse_response(response, MarathonApp, resource_name='app')

def update_app(self, app_id, app, force=False):
def update_app(self, app_id, app, force=False, minimal=True):
"""Update an app.

Applies writable settings in `app` to `app_id`
Expand All @@ -163,6 +163,7 @@ def update_app(self, app_id, app, force=False):
:param app: application settings
:type app: :class:`marathon.models.app.MarathonApp`
:param bool force: apply even if a deployment is in progress
:param bool minimal: ignore nulls and empty collections

:returns: a dict containing the deployment id and version
:rtype: dict
Expand All @@ -171,7 +172,7 @@ def update_app(self, app_id, app, force=False):
app.version = None

params = {'force': force}
data = app.to_json(minimal=True)
data = app.to_json(minimal=minimal)

response = self._do_request('PUT', '/v2/apps/{app_id}'.format(app_id=app_id), params=params, data=data)
return response.json()
Expand Down Expand Up @@ -271,7 +272,7 @@ def get_group(self, group_id):
response = self._do_request('GET', '/v2/groups/{group_id}'.format(group_id=group_id))
return self._parse_response(response, MarathonGroup, resource_name='group')

def update_group(self, group_id, group, force=False):
def update_group(self, group_id, group, force=False, minimal=True):
"""Update a group.

Applies writable settings in `group` to `group_id`
Expand All @@ -281,6 +282,7 @@ def update_group(self, group_id, group, force=False):
:param group: group settings
:type group: :class:`marathon.models.group.MarathonGroup`
:param bool force: apply even if a deployment is in progress
:param bool minimal: ignore nulls and empty collections

:returns: a dict containing the deployment id and version
:rtype: dict
Expand All @@ -289,7 +291,7 @@ def update_group(self, group_id, group, force=False):
group.version = None

params = {'force': force}
data = group.to_json(minimal=True)
data = group.to_json(minimal=minimal)

response = self._do_request('PUT', '/v2/groups/{group_id}'.format(group_id=group_id), data=data, params=params)
return response.json()
Expand Down