~andreserl/maas/refactor_debconf_selections_preseed

« back to all changes in this revision

Viewing changes to src/maasserver/websockets/handlers/node.py

  • Committer: LaMont Jones
  • Date: 2017-02-17 14:23:04 UTC
  • mfrom: (5747 maas)
  • mto: This revision was merged to the branch mainline in revision 5748.
  • Revision ID: lamont@canonical.com-20170217142304-djxqtuvefc1sdfnb
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 
1
# Copyright 2015-2017 Canonical Ltd.  This software is licensed under the
2
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3
3
 
4
4
"""The node handler for the WebSocket connection."""
183
183
 
184
184
            # Machine output
185
185
            data = self.dehydrate_summary_output(obj, data)
186
 
            data["commissioning_results"] = self.dehydrate_script_set(
187
 
                obj.current_commissioning_script_set)
 
186
            # XXX ltrager 2017-01-27 - Show the testing results in the
 
187
            # commissioning table until we get the testing UI done.
 
188
            if obj.current_testing_script_set is not None:
 
189
                data["commissioning_results"] = self.dehydrate_script_set(
 
190
                    chain(
 
191
                        obj.current_commissioning_script_set,
 
192
                        obj.current_testing_script_set,
 
193
                    ))
 
194
            else:
 
195
                data["commissioning_results"] = self.dehydrate_script_set(
 
196
                    obj.current_commissioning_script_set)
188
197
            data["installation_results"] = self.dehydrate_script_set(
189
198
                obj.current_installation_script_set)
190
199