1
=== modified file 'src/maasserver/bootsources.py'
2
--- src/maasserver/bootsources.py	2016-09-30 13:56:04 +0000
3
+++ src/maasserver/bootsources.py	2017-02-09 09:06:11 +0000
4
@@ -10,6 +10,7 @@
5
10
    "get_os_info_from_boot_sources",
10
    "get_os_info_from_boot_sources",
6
11
]
11
]
7
12
12
8
13
import html
9
13
import os
14
import os
10
14
15
11
15
from maasserver.components import (
16
from maasserver.components import (
12
@@ -208,7 +209,8 @@
13
208
    component = COMPONENT.REGION_IMAGE_IMPORT
209
    component = COMPONENT.REGION_IMAGE_IMPORT
14
209
    if len(errors) > 0:
210
    if len(errors) > 0:
15
210
        yield deferToDatabase(
211
        yield deferToDatabase(
17
211
            register_persistent_error, component, "\n".join(errors))
212
            register_persistent_error, component,
18
213
            "<br>".join(map(html.escape, errors)))
19
212
    else:
214
    else:
20
213
        yield deferToDatabase(
215
        yield deferToDatabase(
21
214
            discard_persistent_error, component)
216
            discard_persistent_error, component)
22
215
217
23
=== modified file 'src/maasserver/components.py'
24
--- src/maasserver/components.py	2016-06-30 16:49:02 +0000
25
+++ src/maasserver/components.py	2017-02-09 09:06:11 +0000
26
@@ -1,21 +1,25 @@
27
1
# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
1
# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
28
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
29
3
3
31
4
"""MAAS components management."""
4
"""MAAS components notifications.
32
5
33
6
This is a legacy compatibility shim, to use the new notifications feature to
34
7
display the old components messages. In time this will go away, but it's
35
8
simple enough that there's no rush until it doesn't actually do what we want
36
9
it to do.
37
10
"""
38
5
11
39
6
__all__ = [
12
__all__ = [
40
7
    "discard_persistent_error",
13
    "discard_persistent_error",
41
8
    "get_persistent_error",
14
    "get_persistent_error",
42
9
    "get_persistent_errors",
15
    "get_persistent_errors",
43
10
    "register_persistent_error",
16
    "register_persistent_error",
45
11
    ]
17
]
46
12
18
53
13
from django.utils.safestring import mark_safe
19
from maasserver.enum import COMPONENT
54
14
from maasserver.models import ComponentError
20
from maasserver.models import Notification
55
15
from maasserver.utils.orm import (
21
from maasserver.utils.orm import transactional
56
16
    get_one,
22
from provisioningserver.utils.enum import map_enum
51
17
    transactional,
52
18
)
57
19
23
58
20
24
59
21
@transactional
25
@transactional
60
@@ -24,7 +28,7 @@
61
24
28
62
25
    :param component: An enum value of :class:`COMPONENT`.
29
    :param component: An enum value of :class:`COMPONENT`.
63
26
    """
30
    """
65
27
    ComponentError.objects.filter(component=component).delete()
31
    Notification.objects.filter(ident=component).delete()
66
28
32
67
29
33
68
30
@transactional
34
@transactional
69
@@ -34,25 +38,31 @@
70
34
    :param component: An enum value of :class:`COMPONENT`.
38
    :param component: An enum value of :class:`COMPONENT`.
71
35
    :param error_message: Human-readable error text.
39
    :param error_message: Human-readable error text.
72
36
    """
40
    """
80
37
    component_error, created = ComponentError.objects.get_or_create(
41
    try:
81
38
        component=component, defaults={'error': error_message})
42
        notification = Notification.objects.get(ident=component)
82
39
    # If we didn't create a new object, we may need to update it if the error
43
    except Notification.DoesNotExist:
83
40
    # message is different.
44
        notification = Notification.objects.create_error_for_admins(
84
41
    if not created and component_error.error != error_message:
45
            error_message, ident=component)
85
42
        component_error.error = error_message
46
    else:
86
43
        component_error.save()
47
        if notification.message != error_message:
87
48
            notification.message = error_message
88
49
            notification.save()
89
44
50
90
45
51
91
46
def get_persistent_error(component):
52
def get_persistent_error(component):
92
47
    """Return persistent error for `component`, or None."""
53
    """Return persistent error for `component`, or None."""
95
48
    err = get_one(ComponentError.objects.filter(component=component))
54
    try:
96
49
    if err is None:
55
        notification = Notification.objects.get(ident=component)
97
56
    except Notification.DoesNotExist:
98
50
        return None
57
        return None
99
51
    else:
58
    else:
101
52
        return err.error
59
        return notification.render()
102
53
60
103
54
61
104
55
def get_persistent_errors():
62
def get_persistent_errors():
105
56
    """Return list of current persistent error messages."""
63
    """Return list of current persistent error messages."""
106
64
    components = map_enum(COMPONENT).values()
107
57
    return sorted(
65
    return sorted(
109
58
        mark_safe(err.error) for err in ComponentError.objects.all())
66
        notification.render() for notification in
110
67
        Notification.objects.filter(ident__in=components)
111
68
    )
112
59
69
113
=== modified file 'src/maasserver/context_processors.py'
114
--- src/maasserver/context_processors.py	2016-09-22 02:53:33 +0000
115
+++ src/maasserver/context_processors.py	2017-02-09 09:06:11 +0000
116
@@ -9,7 +9,6 @@
117
9
    ]
9
    ]
118
10
10
119
11
from django.conf import settings
11
from django.conf import settings
120
12
from maasserver.components import get_persistent_errors
121
13
from maasserver.config import RegionConfiguration
12
from maasserver.config import RegionConfiguration
122
14
from maasserver.models import Config
13
from maasserver.models import Config
123
15
from maasserver.utils.version import (
14
from maasserver.utils.version import (
124
@@ -32,7 +31,6 @@
125
32
    if hasattr(request.user, 'userprofile'):
31
    if hasattr(request.user, 'userprofile'):
126
33
        user_completed_intro = request.user.userprofile.completed_intro
32
        user_completed_intro = request.user.userprofile.completed_intro
127
34
    return {
33
    return {
128
35
        'persistent_errors': get_persistent_errors(),
129
36
        'global_options': {
34
        'global_options': {
130
37
            'site_name': Config.objects.get_config('maas_name'),
35
            'site_name': Config.objects.get_config('maas_name'),
131
38
            'enable_analytics': Config.objects.get_config('enable_analytics'),
36
            'enable_analytics': Config.objects.get_config('enable_analytics'),
132
39
37
133
=== added file 'src/maasserver/migrations/builtin/maasserver/0111_remove_component_error.py'
134
--- src/maasserver/migrations/builtin/maasserver/0111_remove_component_error.py	1970-01-01 00:00:00 +0000
135
+++ src/maasserver/migrations/builtin/maasserver/0111_remove_component_error.py	2017-02-09 09:06:11 +0000
136
@@ -0,0 +1,14 @@
137
1
from django.db import migrations
138
2
139
3
140
4
class Migration(migrations.Migration):
141
5
142
6
    dependencies = [
143
7
        ('maasserver', '0110_notification_category'),
144
8
    ]
145
9
146
10
    operations = [
147
11
        migrations.DeleteModel(
148
12
            name='ComponentError',
149
13
        ),
150
14
    ]
151
0
15
152
=== modified file 'src/maasserver/models/__init__.py'
153
--- src/maasserver/models/__init__.py	2017-01-23 19:56:16 +0000
154
+++ src/maasserver/models/__init__.py	2017-02-09 09:06:11 +0000
155
@@ -17,7 +17,6 @@
156
17
    'BootSourceSelection',
17
    'BootSourceSelection',
157
18
    'BridgeInterface',
18
    'BridgeInterface',
158
19
    'CacheSet',
19
    'CacheSet',
159
20
    'ComponentError',
160
21
    'Config',
20
    'Config',
161
22
    'Controller',
21
    'Controller',
162
23
    'Device',
22
    'Device',
163
@@ -108,7 +107,6 @@
164
108
from maasserver.models.bootsourcecache import BootSourceCache
107
from maasserver.models.bootsourcecache import BootSourceCache
165
109
from maasserver.models.bootsourceselection import BootSourceSelection
108
from maasserver.models.bootsourceselection import BootSourceSelection
166
110
from maasserver.models.cacheset import CacheSet
109
from maasserver.models.cacheset import CacheSet
167
111
from maasserver.models.component_error import ComponentError
168
112
from maasserver.models.config import Config
110
from maasserver.models.config import Config
169
113
from maasserver.models.dhcpsnippet import DHCPSnippet
111
from maasserver.models.dhcpsnippet import DHCPSnippet
170
114
from maasserver.models.discovery import Discovery
112
from maasserver.models.discovery import Discovery
171
115
113
172
=== removed file 'src/maasserver/models/component_error.py'
173
--- src/maasserver/models/component_error.py	2015-12-01 18:12:59 +0000
174
+++ src/maasserver/models/component_error.py	1970-01-01 00:00:00 +0000
175
@@ -1,30 +0,0 @@
176
1
# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
177
2
# GNU Affero General Public License version 3 (see the file LICENSE).
178
3
179
4
"""Persistent component errors."""
180
5
181
6
__all__ = [
182
7
    'ComponentError',
183
8
    ]
184
9
185
10
186
11
from django.db.models import CharField
187
12
from maasserver import DefaultMeta
188
13
from maasserver.models.cleansave import CleanSave
189
14
from maasserver.models.timestampedmodel import TimestampedModel
190
15
191
16
192
17
class ComponentError(CleanSave, TimestampedModel):
193
18
    """Error state of a major component of the system."""
194
19
195
20
    class Meta(DefaultMeta):
196
21
        """Needed for South to recognize this model."""
197
22
198
23
    # A descriptor for the failing component, as in the COMPONENT enum.
199
24
    # This is a failure state for an out-of-process component.  We won't
200
25
    # know much about what's wrong, and we don't support multiple errors
201
26
    # for a single component.
202
27
    component = CharField(max_length=40, unique=True, blank=False)
203
28
204
29
    # Human-readable description of what's wrong.
205
30
    error = CharField(max_length=1000, blank=False)
206
31
0
207
=== modified file 'src/maasserver/models/notification.py'
208
--- src/maasserver/models/notification.py	2017-02-02 17:10:32 +0000
209
+++ src/maasserver/models/notification.py	2017-02-09 09:06:11 +0000
210
@@ -23,6 +23,7 @@
211
23
from maasserver.fields import JSONObjectField
23
from maasserver.fields import JSONObjectField
212
24
from maasserver.models.cleansave import CleanSave
24
from maasserver.models.cleansave import CleanSave
213
25
from maasserver.models.timestampedmodel import TimestampedModel
25
from maasserver.models.timestampedmodel import TimestampedModel
214
26
from markupsafe import Markup
215
26
27
216
27
28
217
28
def _create(method, category):
29
def _create(method, category):
218
@@ -172,8 +173,14 @@
219
172
    )
173
    )
220
173
174
221
174
    def render(self):
175
    def render(self):
224
175
        """Render this notification's message using its context."""
176
        """Render this notification's message using its context.
225
176
        return self.message.format(**self.context)
177
226
178
        The message can contain HTML markup. Values from the context are
227
179
        escaped.
228
180
        """
229
181
        markup = Markup(self.message)
230
182
        markup = markup.format(**self.context)
231
183
        return str(markup)
232
177
184
233
178
    def is_relevant_to(self, user):
185
    def is_relevant_to(self, user):
234
179
        """Is this notification relevant to the given user?"""
186
        """Is this notification relevant to the given user?"""
235
180
187
236
=== modified file 'src/maasserver/models/tests/test_notification.py'
237
--- src/maasserver/models/tests/test_notification.py	2017-02-02 17:10:32 +0000
238
+++ src/maasserver/models/tests/test_notification.py	2017-02-09 09:06:11 +0000
239
@@ -167,6 +167,13 @@
240
167
                "There are " + str(thing_b) + " of " +
167
                "There are " + str(thing_b) + " of " +
241
168
                thing_a + " in my suitcase."))
168
                thing_a + " in my suitcase."))
242
169
169
243
170
    def test_render_allows_markup_in_message_but_escapes_context(self):
244
171
        message = "<foo>{bar}</foo>"
245
172
        context = {"bar": "<BAR>"}
246
173
        notification = Notification(message=message, context=context)
247
174
        self.assertThat(
248
175
            notification.render(), Equals("<foo>&lt;BAR&gt;</foo>"))
249
176
250
170
    def test_save_checks_that_rendering_works(self):
177
    def test_save_checks_that_rendering_works(self):
251
171
        message = "Dude, where's my {thing}?"
178
        message = "Dude, where's my {thing}?"
252
172
        notification = Notification(message=message)
179
        notification = Notification(message=message)
253
173
180
254
=== modified file 'src/maasserver/static/js/angular/directives/notifications.js'
255
--- src/maasserver/static/js/angular/directives/notifications.js	2017-02-03 17:03:51 +0000
256
+++ src/maasserver/static/js/angular/directives/notifications.js	2017-02-09 09:06:11 +0000
257
@@ -10,7 +10,7 @@
258
10
      '<div ng-repeat="n in notifications" ng-class="classes[n.category]">',
10
      '<div ng-repeat="n in notifications" ng-class="classes[n.category]">',
259
11
        '<p class="p-notification__response">',
11
        '<p class="p-notification__response">',
260
12
          '<span class="p-notification__status"></span>',
12
          '<span class="p-notification__status"></span>',
262
13
          '<span>{$ n.message $}</span> — ',
13
          '<span ng-bind-html="n.message"></span> — ',
263
14
          '<a ng-click="dismiss(n)">Dismiss</a>',
14
          '<a ng-click="dismiss(n)">Dismiss</a>',
264
15
          '<br><small>(id: {$ n.id $}, ',
15
          '<br><small>(id: {$ n.id $}, ',
265
16
          'ident: {$ n.ident || "-" $}, user: {$ n.user || "-" $}, ',
16
          'ident: {$ n.ident || "-" $}, user: {$ n.user || "-" $}, ',
266
17
17
267
=== modified file 'src/maasserver/static/js/angular/directives/tests/test_notifications.js'
268
--- src/maasserver/static/js/angular/directives/tests/test_notifications.js	2017-02-03 17:19:44 +0000
269
+++ src/maasserver/static/js/angular/directives/tests/test_notifications.js	2017-02-09 09:06:11 +0000
270
@@ -115,6 +115,19 @@
271
115
            ]);
115
            ]);
272
116
        });
116
        });
273
117
117
274
118
        it("sanitizes messages", function() {
275
119
            var harmfulNotification = angular.copy(exampleNotifications[0]);
276
120
            harmfulNotification.message =
277
121
                "Hello <script>alert('Gotcha');</script><em>World</em>!";
278
122
            theNotificationsManager._items = [harmfulNotification];
279
123
            var directive = compileDirective();
280
124
            var messages = directive.find("div > p");
281
125
            expect(messages.html()).not.toContain("<script>");
282
126
            expect(messages.html()).not.toContain("Gotcha");
283
127
            expect(messages.html()).toContain("<em>World</em>");
284
128
            expect(messages.text()).toContain("Hello World!");
285
129
        });
286
130
287
118
    });
131
    });
288
119
132
289
120
});
133
});
290
121
134
291
=== modified file 'src/maasserver/static/js/angular/maas.js'
292
--- src/maasserver/static/js/angular/maas.js	2016-12-14 11:07:08 +0000
293
+++ src/maasserver/static/js/angular/maas.js	2017-02-09 09:06:11 +0000
294
@@ -9,7 +9,7 @@
295
9
 */
9
 */
296
10
10
297
11
angular.module('MAAS',
11
angular.module('MAAS',
299
12
    ['ngRoute', 'ngCookies', 'ngTagsInput', 'sticky']).config(
12
    ['ngRoute', 'ngCookies', 'ngSanitize', 'ngTagsInput', 'sticky']).config(
300
13
    function($interpolateProvider, $routeProvider, $httpProvider) {
13
    function($interpolateProvider, $routeProvider, $httpProvider) {
301
14
        $interpolateProvider.startSymbol('{$');
14
        $interpolateProvider.startSymbol('{$');
302
15
        $interpolateProvider.endSymbol('$}');
15
        $interpolateProvider.endSymbol('$}');
303
16
16
304
=== modified file 'src/maasserver/templates/maasserver/base.html'
305
--- src/maasserver/templates/maasserver/base.html	2017-01-27 11:49:08 +0000
306
+++ src/maasserver/templates/maasserver/base.html	2017-02-09 09:06:11 +0000
307
@@ -150,12 +150,6 @@
308
150
            {% if user.is_authenticated %}
150
            {% if user.is_authenticated %}
309
151
                <div class="row u-padding--top-none u-padding--bottom-none {% block notifications-class %}{% endblock %}">
151
                <div class="row u-padding--top-none u-padding--bottom-none {% block notifications-class %}{% endblock %}">
310
152
                    <div class="wrapper--inner">
152
                    <div class="wrapper--inner">
311
153
                    {% for persistent_error in persistent_errors %}
312
154
                    <div class="p-notification--error">
313
155
                      <p class="p-notification__response">
314
156
                        <span class="p-notification__status">Error:</span>{{ persistent_error }}</p>
315
157
                    </div>
316
158
                    {% endfor %}
317
159
                    {% if messages %}
153
                    {% if messages %}
318
160
                        {% for message in messages %}
154
                        {% for message in messages %}
319
161
                            <div{% if message.tags %} class="p-notification p-notification--{{ message.tags }}" {% endif %}>
155
                            <div{% if message.tags %} class="p-notification p-notification--{{ message.tags }}" {% endif %}>
320
162
156
321
=== modified file 'src/maasserver/templates/maasserver/index.html'
322
--- src/maasserver/templates/maasserver/index.html	2017-01-13 15:42:46 +0000
323
+++ src/maasserver/templates/maasserver/index.html	2017-02-09 09:06:11 +0000
324
@@ -136,12 +136,6 @@
325
136
        {% if user.is_authenticated %}
136
        {% if user.is_authenticated %}
326
137
        <div class="wrapper--inner">
137
        <div class="wrapper--inner">
327
138
            <div class="ng-hide">
138
            <div class="ng-hide">
328
139
                {% for persistent_error in persistent_errors %}
329
140
                <div class="p-notification--error">
330
141
                    <p class="p-notification__response">
331
142
                      <span class="p-notification__status">Error:</span>{{ persistent_error }}</p>
332
143
                </div>
333
144
                {% endfor %}
334
145
                {% if messages %}
139
                {% if messages %}
335
146
                    {% for message in messages %}
140
                    {% for message in messages %}
336
147
                        <div{% if message.tags %} class="p-notification--{{ message.tags }}" {% endif %}>
141
                        <div{% if message.tags %} class="p-notification--{{ message.tags }}" {% endif %}>
337
148
142
338
=== modified file 'src/maasserver/tests/test_bootsources.py'
339
--- src/maasserver/tests/test_bootsources.py	2016-09-30 13:56:04 +0000
340
+++ src/maasserver/tests/test_bootsources.py	2017-02-09 09:06:11 +0000
341
@@ -5,6 +5,7 @@
342
5
5
343
6
__all__ = []
6
__all__ = []
344
7
7
345
8
import html
346
8
from os import environ
9
from os import environ
347
9
from unittest import skip
10
from unittest import skip
348
10
from unittest.mock import (
11
from unittest.mock import (
349
@@ -319,18 +320,21 @@
350
319
            factory.make_BootSource(keyring_data=b'1234') for _ in range(3)]
320
            factory.make_BootSource(keyring_data=b'1234') for _ in range(3)]
351
320
        download_image_descriptions = self.patch(
321
        download_image_descriptions = self.patch(
352
321
            download_descriptions_module, 'download_image_descriptions')
322
            download_descriptions_module, 'download_image_descriptions')
354
322
        error_text = factory.make_name("error_text")
323
        error_text_one = factory.make_name("<error1>")
355
324
        error_text_two = factory.make_name("<error2>")
356
323
        # Make two of the downloads fail.
325
        # Make two of the downloads fail.
357
324
        download_image_descriptions.side_effect = [
326
        download_image_descriptions.side_effect = [
359
325
            ConnectionError(error_text),
327
            ConnectionError(error_text_one),
360
326
            BootImageMapping(),
328
            BootImageMapping(),
362
327
            IOError(error_text),
329
            IOError(error_text_two),
363
328
            ]
330
            ]
364
329
        cache_boot_sources()
331
        cache_boot_sources()
365
330
        base_error = "Failed to import images from boot source {url}: {err}"
332
        base_error = "Failed to import images from boot source {url}: {err}"
369
331
        error_part_one = base_error.format(url=sources[0].url, err=error_text)
333
        error_part_one = base_error.format(
370
332
        error_part_two = base_error.format(url=sources[2].url, err=error_text)
334
            url=sources[0].url, err=html.escape(error_text_one))
371
333
        expected_error = error_part_one + '\n' + error_part_two
335
        error_part_two = base_error.format(
372
336
            url=sources[2].url, err=html.escape(error_text_two))
373
337
        expected_error = error_part_one + '<br>' + error_part_two
374
334
        actual_error = get_persistent_error(COMPONENT.REGION_IMAGE_IMPORT)
338
        actual_error = get_persistent_error(COMPONENT.REGION_IMAGE_IMPORT)
375
335
        self.assertEqual(expected_error, actual_error)
339
        self.assertEqual(expected_error, actual_error)
376
336
340
377
337
341
378
=== renamed file 'src/maasserver/models/tests/test_components.py' => 'src/maasserver/tests/test_components.py'
379
--- src/maasserver/models/tests/test_components.py	2016-06-30 16:49:02 +0000
380
+++ src/maasserver/tests/test_components.py	2017-02-09 09:06:11 +0000
381
@@ -10,12 +10,11 @@
382
10
10
383
11
from maasserver.components import (
11
from maasserver.components import (
384
12
    discard_persistent_error,
12
    discard_persistent_error,
385
13
    get_persistent_error,
386
14
    get_persistent_errors,
13
    get_persistent_errors,
387
15
    register_persistent_error,
14
    register_persistent_error,
388
16
)
15
)
389
17
from maasserver.enum import COMPONENT
16
from maasserver.enum import COMPONENT
391
18
from maasserver.models.component_error import ComponentError
17
from maasserver.models import Notification
392
19
from maasserver.testing.factory import factory
18
from maasserver.testing.factory import factory
393
20
from maasserver.testing.testcase import MAASServerTestCase
19
from maasserver.testing.testcase import MAASServerTestCase
394
21
from provisioningserver.utils.enum import map_enum
20
from provisioningserver.utils.enum import map_enum
395
@@ -27,9 +26,6 @@
396
27
26
397
28
class PersistentErrorsUtilitiesTest(MAASServerTestCase):
27
class PersistentErrorsUtilitiesTest(MAASServerTestCase):
398
29
28
399
30
    def setUp(self):
400
31
        super(PersistentErrorsUtilitiesTest, self).setUp()
401
32
402
33
    def test_register_persistent_error_registers_error(self):
29
    def test_register_persistent_error_registers_error(self):
403
34
        error_message = factory.make_string()
30
        error_message = factory.make_string()
404
35
        component = get_random_component()
31
        component = get_random_component()
405
@@ -70,15 +66,6 @@
406
70
            components.append(component)
66
            components.append(component)
407
71
        self.assertItemsEqual(errors, get_persistent_errors())
67
        self.assertItemsEqual(errors, get_persistent_errors())
408
72
68
409
73
    def test_get_persistent_error_returns_None_if_no_error(self):
410
74
        self.assertIsNone(get_persistent_error(factory.make_name('component')))
411
75
412
76
    def test_get_persistent_error_returns_component_error(self):
413
77
        component = factory.make_name('component')
414
78
        error = factory.make_name('error')
415
79
        register_persistent_error(component, error)
416
80
        self.assertEqual(error, get_persistent_error(component))
417
81
418
82
    def test_register_persistent_error_reuses_component_errors(self):
69
    def test_register_persistent_error_reuses_component_errors(self):
419
83
        """When registering a persistent error that already has an error
70
        """When registering a persistent error that already has an error
420
84
        recorded for that component, reuse the error instead of deleting and
71
        recorded for that component, reuse the error instead of deleting and
421
@@ -87,10 +74,12 @@
422
87
        error1 = factory.make_name('error')
74
        error1 = factory.make_name('error')
423
88
        error2 = factory.make_name('error')
75
        error2 = factory.make_name('error')
424
89
        register_persistent_error(component, error1)
76
        register_persistent_error(component, error1)
428
90
        error = ComponentError.objects.get(component=component)
77
        notification = Notification.objects.get(ident=component)
429
91
        self.assertEqual(error.error, error1)  # Should be our error
78
        self.assertEqual(notification.render(), error1)
430
92
        error_id = error.id
79
        notification_id = notification.id
431
93
        register_persistent_error(component, error2)
80
        register_persistent_error(component, error2)
435
94
        error = ComponentError.objects.get(component=component)
81
        notification = Notification.objects.get(ident=component)
436
95
        self.assertEqual(error.error, error2)  # Should update the message
82
        # The message is updated.
437
96
        self.assertEqual(error.id, error_id)  # Should reuse the same id
83
        self.assertEqual(notification.render(), error2)
438
84
        # The same notification row is used.
439
85
        self.assertEqual(notification.id, notification_id)
440
97
86
441
=== modified file 'src/maasserver/views/combo.py'
442
--- src/maasserver/views/combo.py	2017-02-01 22:18:19 +0000
443
+++ src/maasserver/views/combo.py	2017-02-09 09:06:11 +0000
444
@@ -39,6 +39,7 @@
445
39
            "angular.min.js",
39
            "angular.min.js",
446
40
            "angular-route.min.js",
40
            "angular-route.min.js",
447
41
            "angular-cookies.min.js",
41
            "angular-cookies.min.js",
448
42
            "angular-sanitize.min.js",
449
42
        ]
43
        ]
450
43
    },
44
    },
451
44
    "ng-tags-input.js": {
45
    "ng-tags-input.js": {
452
45
46
453
=== modified file 'src/maasserver/views/tests/test_general.py'
454
--- src/maasserver/views/tests/test_general.py	2016-12-12 21:40:28 +0000
455
+++ src/maasserver/views/tests/test_general.py	2017-02-09 09:06:11 +0000
456
@@ -6,22 +6,17 @@
457
6
__all__ = []
6
__all__ = []
458
7
7
459
8
import http.client
8
import http.client
460
9
from random import randint
461
10
from urllib.parse import (
9
from urllib.parse import (
462
11
    parse_qs,
10
    parse_qs,
463
12
    urlparse,
11
    urlparse,
464
13
)
12
)
465
14
from xmlrpc.client import Fault
466
15
13
467
16
from django.conf import settings
14
from django.conf import settings
468
17
from django.conf.urls import patterns
15
from django.conf.urls import patterns
469
18
from django.core.exceptions import PermissionDenied
16
from django.core.exceptions import PermissionDenied
470
19
from django.core.urlresolvers import reverse
471
20
from django.http import Http404
17
from django.http import Http404
472
21
from django.test.client import RequestFactory
18
from django.test.client import RequestFactory
473
22
from django.utils.html import escape
474
23
from lxml.html import fromstring
19
from lxml.html import fromstring
475
24
from maasserver.components import register_persistent_error
476
25
from maasserver.testing import extract_redirect
20
from maasserver.testing import extract_redirect
477
26
from maasserver.testing.factory import factory
21
from maasserver.testing.factory import factory
478
27
from maasserver.testing.testcase import MAASServerTestCase
22
from maasserver.testing.testcase import MAASServerTestCase
479
@@ -29,7 +24,6 @@
480
29
    HelpfulDeleteView,
24
    HelpfulDeleteView,
481
30
    PaginatedListView,
25
    PaginatedListView,
482
31
)
26
)
483
32
from testtools.matchers import ContainsAll
484
33
27
485
34
28
486
35
class Test404500(MAASServerTestCase):
29
class Test404500(MAASServerTestCase):
487
@@ -313,33 +307,3 @@
488
313
                "page": ["4"],
307
                "page": ["4"],
489
314
            },
308
            },
490
315
            parse_qs(urlparse(context["last_page_link"]).query))
309
            parse_qs(urlparse(context["last_page_link"]).query))
491
316
492
317
493
318
class PermanentErrorDisplayTest(MAASServerTestCase):
494
319
495
320
    def test_permanent_error_displayed(self):
496
321
        self.client_log_in()
497
322
        fault_codes = [
498
323
            randint(1, 100),
499
324
            randint(101, 200),
500
325
            ]
501
326
        errors = []
502
327
        for fault in fault_codes:
503
328
            # Create component with make_string to be sure to display all
504
329
            # the errors.
505
330
            component = factory.make_name('component')
506
331
            error_message = factory.make_name('error')
507
332
            errors.append(Fault(fault, error_message))
508
333
            register_persistent_error(component, error_message)
509
334
        links = [
510
335
            reverse('index'),
511
336
            reverse('prefs'),
512
337
        ]
513
338
        for link in links:
514
339
            response = self.client.get(link)
515
340
            self.assertThat(
516
341
                response.content,
517
342
                ContainsAll([
518
343
                    escape(error.faultString).encode(settings.DEFAULT_CHARSET)
519
344
                    for error in errors
520
345
                ]))
521
346
310
522
=== modified file 'src/maastesting/karma.conf.js'
523
--- src/maastesting/karma.conf.js	2015-03-26 17:55:20 +0000
524
+++ src/maastesting/karma.conf.js	2017-02-09 09:06:11 +0000
525
@@ -20,6 +20,7 @@
526
20
      '/usr/share/javascript/angular.js/angular-route.js',
20
      '/usr/share/javascript/angular.js/angular-route.js',
527
21
      '/usr/share/javascript/angular.js/angular-mocks.js',
21
      '/usr/share/javascript/angular.js/angular-mocks.js',
528
22
      '/usr/share/javascript/angular.js/angular-cookies.js',
22
      '/usr/share/javascript/angular.js/angular-cookies.js',
529
23
      '/usr/share/javascript/angular.js/angular-sanitize.js',
530
23
      '../../src/maasserver/static/js/angular/maas.js',
24
      '../../src/maasserver/static/js/angular/maas.js',
531
24
      '../../src/maasserver/static/js/angular/testing/*.js',
25
      '../../src/maasserver/static/js/angular/testing/*.js',
532
25
      '../../src/maasserver/static/js/angular/*/*.js',
26
      '../../src/maasserver/static/js/angular/*/*.js',
533
26
27
534
=== modified file 'utilities/check-imports'
535
--- utilities/check-imports	2017-02-04 21:59:38 +0000
536
+++ utilities/check-imports	2017-02-09 09:06:11 +0000
537
@@ -245,6 +245,7 @@
538
245
    Allow("lxml|lxml.**"),
245
    Allow("lxml|lxml.**"),
539
246
    Allow("maascli.utils.parse_docstring"),
246
    Allow("maascli.utils.parse_docstring"),
540
247
    Allow("maasserver|maasserver.**"),
247
    Allow("maasserver|maasserver.**"),
541
248
    Allow("markupsafe|markupsafe.**"),
542
248
    Allow("metadataserver|metadataserver.**"),
249
    Allow("metadataserver|metadataserver.**"),
543
249
    Allow("netaddr|netaddr.**"),
250
    Allow("netaddr|netaddr.**"),
544
250
    Allow("oauth|oauth.**"),
251
    Allow("oauth|oauth.**"),
Status:	Merged
Approved by:	Gavin Panella on 2017-02-09
Approved revision:	no longer in the source branch.
Merged at revision:	5702
Proposed branch:	lp:~allenap/maas/notifications-creation
Merge into:	lp:~maas-committers/maas/trunk
Diff against target:	544 lines (+100/-133) 19 files modified src/maasserver/bootsources.py (+3/-1) src/maasserver/components.py (+30/-20) src/maasserver/context_processors.py (+0/-2) src/maasserver/migrations/builtin/maasserver/0111_remove_component_error.py (+14/-0) src/maasserver/models/__init__.py (+0/-2) src/maasserver/models/component_error.py (+0/-30) src/maasserver/models/notification.py (+9/-2) src/maasserver/models/tests/test_notification.py (+7/-0) src/maasserver/static/js/angular/directives/notifications.js (+1/-1) src/maasserver/static/js/angular/directives/tests/test_notifications.js (+13/-0) src/maasserver/static/js/angular/maas.js (+1/-1) src/maasserver/templates/maasserver/base.html (+0/-6) src/maasserver/templates/maasserver/index.html (+0/-6) src/maasserver/tests/test_bootsources.py (+10/-6) src/maasserver/tests/test_components.py (+9/-20) src/maasserver/views/combo.py (+1/-0) src/maasserver/views/tests/test_general.py (+0/-36) src/maastesting/karma.conf.js (+1/-0) utilities/check-imports (+1/-0)
To merge this branch:	bzr merge lp:~allenap/maas/notifications-creation
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Blake Rouse (community)		2017-02-08	Approve on 2017-02-08
Review via email: mp+316718@code.launchpad.net