1
=== modified file 'etc/maas/templates/power/ipmi.template'
2
--- etc/maas/templates/power/ipmi.template	2013-04-22 16:24:50 +0000
3
+++ etc/maas/templates/power/ipmi.template	2014-02-27 02:34:14 +0000
4
@@ -13,6 +13,12 @@
5
13
ipmi_chassis_config={{ipmi_chassis_config}}
13
ipmi_chassis_config={{ipmi_chassis_config}}
6
14
config={{config_dir}}/{{ipmi_config}}
14
config={{config_dir}}/{{ipmi_config}}
7
15
15
8
16
# If ip_address was supplied, use it in preference to the power_address,
9
17
# because it gets discovered on-the-fly based on mac_address.
10
18
{{if ip_address}}
11
19
power_address={{ip_address}}
12
20
{{endif}}
13
21
14
16
# Determines the power command needed to execute the desired
22
# Determines the power command needed to execute the desired
15
17
# action. This function receives ${power_change} as argument.
23
# action. This function receives ${power_change} as argument.
16
18
formulate_power_command() {
24
formulate_power_command() {
17
19
25
18
=== modified file 'src/maasserver/models/node.py'
19
--- src/maasserver/models/node.py	2014-02-25 15:53:10 +0000
20
+++ src/maasserver/models/node.py	2014-02-27 02:34:14 +0000
21
@@ -774,8 +774,8 @@
22
774
        power_params.setdefault('power_driver', '')
774
        power_params.setdefault('power_driver', '')
23
775
775
24
776
        # The "mac" parameter defaults to the node's primary MAC
776
        # The "mac" parameter defaults to the node's primary MAC
27
777
        # address, but only if no power parameters were set at all.
777
        # address, but only if not already set.
28
778
        if not self.power_parameters:
778
        if 'mac_address' not in power_params:
29
779
            primary_mac = self.get_primary_mac()
779
            primary_mac = self.get_primary_mac()
30
780
            if primary_mac is not None:
780
            if primary_mac is not None:
31
781
                power_params['mac_address'] = primary_mac.mac_address
781
                power_params['mac_address'] = primary_mac.mac_address
32
782
782
33
=== modified file 'src/maasserver/models/tests/test_node.py'
34
--- src/maasserver/models/tests/test_node.py	2014-02-21 09:25:46 +0000
35
+++ src/maasserver/models/tests/test_node.py	2014-02-27 02:34:14 +0000
36
@@ -1083,16 +1083,18 @@
37
1083
                self.celery.tasks[0]['kwargs']['mac_address'],
1083
                self.celery.tasks[0]['kwargs']['mac_address'],
38
1084
            ))
1084
            ))
39
1085
1085
41
1086
    def test_start_nodes_wakeonlan_ignores_invalid_parameters(self):
1086
    def test_start_nodes_wakeonlan_falls_back_to_primary_mac(self):
42
1087
        # If node.power_params is set but doesn't have "mac_address" in it,
1087
        # If node.power_params is set but doesn't have "mac_address" in it,
44
1088
        # then the node shouldn't be started.
1088
        # then use the node's primary MAC.
45
1089
        user = factory.make_user()
1089
        user = factory.make_user()
46
1090
        node, mac = self.make_node_with_mac(
1090
        node, mac = self.make_node_with_mac(
47
1091
            user, power_type='ether_wake',
1091
            user, power_type='ether_wake',
48
1092
            power_parameters=dict(jarjar="binks"))
1092
            power_parameters=dict(jarjar="binks"))
49
1093
        output = Node.objects.start_nodes([node.system_id], user)
1093
        output = Node.objects.start_nodes([node.system_id], user)
52
1094
        self.assertItemsEqual([], output)
1094
        self.assertItemsEqual([node], output)
53
1095
        self.assertEqual([], self.celery.tasks)
1095
        self.assertEqual(
54
1096
            unicode(node.get_primary_mac()),
55
1097
            self.celery.tasks[0]['kwargs']['mac_address'])
56
1096
1098
57
1097
    def test_start_nodes_wakeonlan_ignores_empty_mac_address_parameter(self):
1099
    def test_start_nodes_wakeonlan_ignores_empty_mac_address_parameter(self):
58
1098
        user = factory.make_user()
1100
        user = factory.make_user()
59
1099
1101
60
=== modified file 'src/maasserver/power_parameters.py'
61
--- src/maasserver/power_parameters.py	2014-02-26 16:20:56 +0000
62
+++ src/maasserver/power_parameters.py	2014-02-27 02:34:14 +0000
63
@@ -173,9 +173,13 @@
64
173
            make_json_field(
173
            make_json_field(
65
174
                'power_driver', "Power driver", field_type='choice',
174
                'power_driver', "Power driver", field_type='choice',
66
175
                choices=IPMI_DRIVER_CHOICES, default=IPMI_DRIVER.LAN_2_0),
175
                choices=IPMI_DRIVER_CHOICES, default=IPMI_DRIVER.LAN_2_0),
68
176
            make_json_field('power_address', "Power address"),
176
            make_json_field('power_address', "IP address"),
69
177
            make_json_field('power_user', "Power user"),
177
            make_json_field('power_user', "Power user"),
70
178
            make_json_field('power_pass', "Power password"),
178
            make_json_field('power_pass', "Power password"),
71
179
            make_json_field(
72
180
                'mac_address',
73
181
                "MAC address - the IP is looked up with ARP and overrides "
74
182
                "IP address"),
75
179
        ],
183
        ],
76
180
    },
184
    },
77
181
    {
185
    {
78
182
186
79
=== modified file 'src/provisioningserver/power/tests/test_poweraction.py'
80
--- src/provisioningserver/power/tests/test_poweraction.py	2014-01-14 01:03:56 +0000
81
+++ src/provisioningserver/power/tests/test_poweraction.py	2014-02-27 02:34:14 +0000
82
@@ -207,7 +207,7 @@
83
207
            action.get_template(), power_change='on',
207
            action.get_template(), power_change='on',
84
208
            power_address='mystystem', power_user='me', power_pass='me',
208
            power_address='mystystem', power_user='me', power_pass='me',
85
209
            ipmipower='echo', ipmi_chassis_config='echo', config_dir='dir',
209
            ipmipower='echo', ipmi_chassis_config='echo', config_dir='dir',
87
210
            ipmi_config='file.conf', power_driver='LAN')
210
            ipmi_config='file.conf', power_driver='LAN', ip_address='')
88
211
        self.assertIn(conf_dir, script)
211
        self.assertIn(conf_dir, script)
89
212
212
90
213
    def test_moonshot_checks_state(self):
213
    def test_moonshot_checks_state(self):
91
214
214
92
=== modified file 'src/provisioningserver/tasks.py'
93
--- src/provisioningserver/tasks.py	2014-02-24 01:42:18 +0000
94
+++ src/provisioningserver/tasks.py	2014-02-27 02:34:14 +0000
95
@@ -137,6 +137,7 @@
96
137
    kwargs['power_change'] = power_change
137
    kwargs['power_change'] = power_change
97
138
    if 'mac_address' in kwargs:
138
    if 'mac_address' in kwargs:
98
139
        kwargs['ip_address'] = find_ip_via_arp(kwargs['mac_address'])
139
        kwargs['ip_address'] = find_ip_via_arp(kwargs['mac_address'])
99
140
    kwargs.setdefault('ip_address', None)
100
140
    try:
141
    try:
101
141
        pa = PowerAction(power_type)
142
        pa = PowerAction(power_type)
102
142
        pa.execute(**kwargs)
143
        pa.execute(**kwargs)
Reviewer	Review Type	Date Requested	Status
Jeroen T. Vermeulen (community)		2014-02-26	Approve on 2014-02-27
Review via email: mp+208286@code.launchpad.net