MAAS

Merge ~newell-jensen/maas:remove-pod-console-logging-api into maas:master

  1. Git
  2. lp:~newell-jensen/maas
  3. remove-pod-console-logging-api
  4. Merge into master
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: d0fa8c70ecce800d59dfa67e61b1c45a8988f20d
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:remove-pod-console-logging-api
Merge into: maas:master
Diff against target: 34 lines (+1/-7)
2 files modified
src/maasserver/api/pods.py (+1/-6)
src/maasserver/api/tests/test_pods.py (+0/-1)
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
MAAS Lander Approve
Review via email: mp+361932@code.launchpad.net

Commit message

Remove console_log parameter from the pod API documentation.

Description of the change

This was done in a separate branch because we wanted to keep this documentation in 2.5. Now that the pod console logging being the default has been backported, we can remove this.

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b remove-pod-console-logging-api lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: d0fa8c70ecce800d59dfa67e61b1c45a8988f20d

review: Approve
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good!

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b remove-pod-console-logging-api lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4909/consoleText

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/api/pods.py b/src/maasserver/api/pods.py
2index adc1bb4..f5ab152 100644
3--- a/src/maasserver/api/pods.py
4+++ b/src/maasserver/api/pods.py
5@@ -1,4 +1,4 @@
6-# Copyright 2016-2018 Canonical Ltd. This software is licensed under the
7+# Copyright 2016-2019 Canonical Ltd. This software is licensed under the
8 # GNU Affero General Public License version 3 (see the file LICENSE).
9
10 """API handlers: `Pod`."""
11@@ -158,11 +158,6 @@ class PodHandler(OperationsHandler):
12 mode for pods that use it: bridge, passthru, private, vepa.
13 @param (string) "tags" [required=false] Tag or tags (command separated)
14 associated with the pod.
15- @param (boolean) "console_log" [required=false] If 'True', VMs composed
16- in this pod will have console output logged (Note: this will
17- automatically create a tag named 'pod-console-logging' and apply it to
18- the pod). If 'False', MAAS deletes the 'pod-console-logging' tag, if
19- any, which turns off console logging.
20
21 @success (http-status-code) "200" 200
22 @success (json) "success-json" A JSON pod object.
23diff --git a/src/maasserver/api/tests/test_pods.py b/src/maasserver/api/tests/test_pods.py
24index 4d28373..43675f0 100644
25--- a/src/maasserver/api/tests/test_pods.py
26+++ b/src/maasserver/api/tests/test_pods.py
27@@ -296,7 +296,6 @@ class TestPodAPI(APITestCase.ForUser, PodMixin):
28 'power_pass': new_power_parameters['power_pass'],
29 'zone': new_zone.name,
30 'pool': new_pool.name,
31- 'console_logging': 'True',
32 })
33 self.assertEqual(
34 http.client.OK, response.status_code, response.content)

Subscribers

People subscribed via source and target branches