1
=== modified file 'docs/changelog.rst'
2
--- docs/changelog.rst	2016-06-30 17:36:38 +0000
3
+++ docs/changelog.rst	2016-07-11 16:38:15 +0000
4
@@ -19,6 +19,8 @@
5
19
19
6
20
LP: #1597460    [1.9] MAAS 1.9 should only download filetypes from a SimpleStream is can process
20
LP: #1597460    [1.9] MAAS 1.9 should only download filetypes from a SimpleStream is can process
7
21
21
8
22
LP: #1567249    [1.9] If rack and region have different versions, the error is uninformative and confusing.
9
23
10
22
1.9.3
24
1.9.3
11
23
=====
25
=====
12
24
26
13
25
27
14
=== modified file 'src/maasserver/clusterrpc/power_parameters.py'
15
--- src/maasserver/clusterrpc/power_parameters.py	2015-10-19 04:54:14 +0000
16
+++ src/maasserver/clusterrpc/power_parameters.py	2016-07-11 16:38:15 +0000
17
@@ -40,6 +40,7 @@
18
40
from jsonschema import validate
40
from jsonschema import validate
19
41
from maasserver.clusterrpc.utils import call_clusters
41
from maasserver.clusterrpc.utils import call_clusters
20
42
from maasserver.config_forms import DictCharField
42
from maasserver.config_forms import DictCharField
21
43
from maasserver.exceptions import ClusterUnavailable
22
43
from maasserver.fields import MACAddressFormField
44
from maasserver.fields import MACAddressFormField
23
44
from maasserver.utils.forms import compose_invalid_choice_text
45
from maasserver.utils.forms import compose_invalid_choice_text
24
45
from provisioningserver.power.schema import (
46
from provisioningserver.power.schema import (
25
@@ -199,7 +200,20 @@
26
199
            name = power_type['name']
200
            name = power_type['name']
27
200
            fields = power_type['fields']
201
            fields = power_type['fields']
28
201
            description = power_type['description']
202
            description = power_type['description']
30
202
            missing_packages = power_type['missing_packages']
203
            try:
31
204
                missing_packages = power_type['missing_packages']
32
205
            except KeyError:
33
206
                msg = (
34
207
                    """Bad response from cluster controller.  This likely """
35
208
                    """means that it is running an earlier version of MAAS.""")
36
209
                if nodegroups is not None:
37
210
                    if len(nodegroups) == 1:
38
211
                        msg += " Controller: "
39
212
                    else:
40
213
                        msg += " Controllers: "
41
214
                    msg += ", ".join([ctl.name for ctl in nodegroups])
42
215
                    msg += "."
43
216
                raise ClusterUnavailable(msg)
44
203
            add_power_type_parameters(
217
            add_power_type_parameters(
45
204
                name, description, fields, missing_packages, merged_types)
218
                name, description, fields, missing_packages, merged_types)
46
205
    return sorted(merged_types, key=itemgetter("description"))
219
    return sorted(merged_types, key=itemgetter("description"))
47
206
220
48
=== modified file 'src/maasserver/clusterrpc/tests/test_power_parameters.py'
49
--- src/maasserver/clusterrpc/tests/test_power_parameters.py	2015-10-01 22:48:50 +0000
50
+++ src/maasserver/clusterrpc/tests/test_power_parameters.py	2016-07-11 16:38:15 +0000
51
@@ -27,6 +27,7 @@
52
27
    POWER_TYPE_PARAMETER_FIELD_SCHEMA,
27
    POWER_TYPE_PARAMETER_FIELD_SCHEMA,
53
28
)
28
)
54
29
from maasserver.config_forms import DictCharField
29
from maasserver.config_forms import DictCharField
55
30
from maasserver.exceptions import ClusterUnavailable
56
30
from maasserver.fields import MACAddressFormField
31
from maasserver.fields import MACAddressFormField
57
31
from maasserver.testing.factory import factory
32
from maasserver.testing.factory import factory
58
32
from maasserver.testing.testcase import MAASServerTestCase
33
from maasserver.testing.testcase import MAASServerTestCase
59
@@ -322,3 +323,20 @@
60
322
        self.assertThat(
323
        self.assertThat(
61
323
            mocked, MockCalledOnceWith(
324
            mocked, MockCalledOnceWith(
62
324
                sentinel.nodegroup, sentinel.ignore_errors))
325
                sentinel.nodegroup, sentinel.ignore_errors))
63
326
64
327
    def test_get_power_types_detects_missing_missing_packages_key(self):
65
328
        mocked = self.patch(power_parameters, "call_clusters")
66
329
        mocked.return_value = [{
67
330
            'power_types': [
68
331
                {'name': "virsh", 'fields': "foo", 'description': "desc"},
69
332
                {'name': "other", 'fields': "bar", 'description': "meh"},
70
333
            ],
71
334
        }]
72
335
        e = self.assertRaises(
73
336
            ClusterUnavailable,
74
337
            power_parameters.get_all_power_types_from_clusters
75
338
        )
76
339
        self.assertEqual(
77
340
            """Bad response from cluster controller.  This likely """
78
341
            """means that it is running an earlier version of MAAS.""",
79
342
            e.message)
Reviewer	Review Type	Date Requested	Status
Blake Rouse (community)		2016-07-08	Approve on 2016-07-11
Review via email: mp+299608@code.launchpad.net