1
=== modified file 'src/maasserver/rpc/nodes.py'
2
--- src/maasserver/rpc/nodes.py	2014-09-10 16:20:31 +0000
3
+++ src/maasserver/rpc/nodes.py	2014-09-22 12:05:24 +0000
4
@@ -33,6 +33,7 @@
5
33
    NoSuchNode,
33
    NoSuchNode,
6
34
    )
34
    )
7
35
from provisioningserver.utils.twisted import synchronous
35
from provisioningserver.utils.twisted import synchronous
8
36
import simplejson as json
9
36
37
10
37
38
11
38
@synchronous
39
@synchronous
12
@@ -128,6 +129,10 @@
13
128
    form = AdminNodeWithMACAddressesForm(data_query_dict)
129
    form = AdminNodeWithMACAddressesForm(data_query_dict)
14
129
    if form.is_valid():
130
    if form.is_valid():
15
130
        node = form.save()
131
        node = form.save()
16
132
        # We have to explicitly save the power parameters; the form
17
133
        # won't do it for us.
18
134
        node.power_parameters = json.loads(power_parameters)
19
135
        node.save()
20
131
        return node
136
        return node
21
132
    else:
137
    else:
22
133
        raise ValidationError(form.errors)
138
        raise ValidationError(form.errors)
23
134
139
24
=== modified file 'src/maasserver/rpc/tests/test_nodes.py'
25
--- src/maasserver/rpc/tests/test_nodes.py	2014-09-19 03:44:04 +0000
26
+++ src/maasserver/rpc/tests/test_nodes.py	2014-09-22 12:05:24 +0000
27
@@ -25,6 +25,7 @@
28
25
    RunningEventLoopFixture,
25
    RunningEventLoopFixture,
29
26
    )
26
    )
30
27
from maasserver.testing.factory import factory
27
from maasserver.testing.factory import factory
31
28
from maasserver.testing.orm import reload_object
32
28
from maasserver.testing.testcase import MAASServerTestCase
29
from maasserver.testing.testcase import MAASServerTestCase
33
29
from provisioningserver.drivers import PowerTypeRegistry
30
from provisioningserver.drivers import PowerTypeRegistry
34
30
from provisioningserver.rpc.cluster import DescribePowerTypes
31
from provisioningserver.rpc.cluster import DescribePowerTypes
35
@@ -66,7 +67,7 @@
36
66
                cluster,
67
                cluster,
37
67
                architecture,
68
                architecture,
38
68
                power_type,
69
                power_type,
40
69
                ''
70
                {},
41
70
            ),
71
            ),
42
71
            (
72
            (
43
72
                node.nodegroup,
73
                node.nodegroup,
44
@@ -106,3 +107,26 @@
45
106
        self.assertRaises(
107
        self.assertRaises(
46
107
            NodeAlreadyExists, create_node, cluster.uuid, architecture,
108
            NodeAlreadyExists, create_node, cluster.uuid, architecture,
47
108
            power_type, power_parameters, [mac_addresses[0]])
109
            power_type, power_parameters, [mac_addresses[0]])
48
110
49
111
    def test__saves_power_parameters(self):
50
112
        cluster = factory.make_NodeGroup()
51
113
        cluster.accept()
52
114
        self.prepare_cluster_rpc(cluster)
53
115
54
116
        mac_addresses = [
55
117
            factory.make_mac_address() for _ in range(3)]
56
118
        architecture = make_usable_architecture(self)
57
119
        power_type = random.choice(self.power_types)['name']
58
120
        power_parameters = {
59
121
            factory.make_name('key'): factory.make_name('value')
60
122
            for _ in range(3)
61
123
        }
62
124
63
125
        node = create_node(
64
126
            cluster.uuid, architecture, power_type, dumps(power_parameters),
65
127
            mac_addresses)
66
128
67
129
        # Reload the object from the DB so that we're sure its power
68
130
        # parameters are being persisted.
69
131
        node = reload_object(node)
70
132
        self.assertEqual(power_parameters, node.power_parameters)
Reviewer	Review Type	Date Requested	Status
Raphaël Badin (community)		2014-09-22	Approve on 2014-09-22
Review via email: mp+235444@code.launchpad.net