1
=== modified file 'etc/maas/templates/power/amt.template'
2
--- etc/maas/templates/power/amt.template	2014-01-27 16:56:02 +0000
3
+++ etc/maas/templates/power/amt.template	2014-02-13 11:16:49 +0000
4
@@ -2,19 +2,18 @@
5
2
# -*- mode: shell-script -*-
2
# -*- mode: shell-script -*-
6
3
#
3
#
7
4
# Control a system via amttool
4
# Control a system via amttool
8
5
power_address='{{power_address}}'
9
6
power_change='{{power_change}}'
5
power_change='{{power_change}}'
10
7
power_pass='{{power_pass}}'
6
power_pass='{{power_pass}}'
11
8
7
12
9
echo amt.template starting $*
8
echo amt.template starting $*
13
10
9
15
11
echo power_address $power_address
10
echo ip_address $ip_address
16
12
echo power_change $power_change
11
echo power_change $power_change
17
13
echo power_pass $power_pass
12
echo power_pass $power_pass
18
14
13
19
15
amt() {
14
amt() {
22
16
  echo running amttool "$power_address" $*
15
  echo running amttool "$ip_address" $*
23
17
  AMT_PASSWORD="$power_pass" amttool "$power_address" "$@"
16
  AMT_PASSWORD="$power_pass" amttool "$ip_address" "$@"
24
18
}
17
}
25
19
18
26
20
state() {
19
state() {
27
21
20
28
=== modified file 'src/maasserver/power_parameters.py'
29
--- src/maasserver/power_parameters.py	2014-02-10 12:06:51 +0000
30
+++ src/maasserver/power_parameters.py	2014-02-13 11:16:49 +0000
31
@@ -199,7 +199,8 @@
32
199
    {
199
    {
33
200
        'name': 'amt',
200
        'name': 'amt',
34
201
        'fields': [
201
        'fields': [
36
202
            make_json_field('power_address', "Power address"),
202
            make_json_field(
37
203
                'mac_address', "MAC Address", field_type='mac_address'),
38
203
            make_json_field('power_pass', "Power password"),
204
            make_json_field('power_pass', "Power password"),
39
204
        ],
205
        ],
40
205
    },
206
    },
41
206
207
42
=== modified file 'src/provisioningserver/tasks.py'
43
--- src/provisioningserver/tasks.py	2014-01-05 21:27:58 +0000
44
+++ src/provisioningserver/tasks.py	2014-02-13 11:16:49 +0000
45
@@ -134,6 +134,8 @@
46
134
    assert power_change in ('on', 'off'), (
134
    assert power_change in ('on', 'off'), (
47
135
        "Unknown power change keyword: %s" % power_change)
135
        "Unknown power change keyword: %s" % power_change)
48
136
    kwargs['power_change'] = power_change
136
    kwargs['power_change'] = power_change
49
137
    if 'mac_address' in kwargs:
50
138
        kwargs['ip_address'] = find_ip_via_arp(kwargs['mac_address'])
51
137
    try:
139
    try:
52
138
        pa = PowerAction(power_type)
140
        pa = PowerAction(power_type)
53
139
        pa.execute(**kwargs)
141
        pa.execute(**kwargs)
54
140
142
55
=== modified file 'src/provisioningserver/tests/test_tasks.py'
56
--- src/provisioningserver/tests/test_tasks.py	2014-01-27 20:16:45 +0000
57
+++ src/provisioningserver/tests/test_tasks.py	2014-02-13 11:16:49 +0000
58
@@ -39,6 +39,7 @@
59
39
from mock import (
39
from mock import (
60
40
    ANY,
40
    ANY,
61
41
    Mock,
41
    Mock,
62
42
    sentinel,
63
42
    )
43
    )
64
43
from netaddr import IPNetwork
44
from netaddr import IPNetwork
65
44
from provisioningserver import (
45
from provisioningserver import (
66
@@ -158,6 +159,43 @@
67
158
            "ether_wake", mac=arbitrary_mac)
159
            "ether_wake", mac=arbitrary_mac)
68
159
160
69
160
161
70
162
class TestPowerTasksResolveMACAddresses(PservTestCase):
71
163
72
164
    def test_ip_address_is_looked_up_from_mac_address(self):
73
165
        # Patch out PowerAction; we're just trying to demonstrate that
74
166
        # it's invoked with an IP address even if one is not supplied.
75
167
        PowerAction = self.patch(tasks, "PowerAction")
76
168
        # find_ip_via_arp() is tested elsewhere; we just want to know
77
169
        # that it has been used.
78
170
        self.patch(tasks, "find_ip_via_arp").return_value = sentinel.ip_address
79
171
        # PowerAction.execute() is passed an ip_address argument in
80
172
        # addition to the mac_address argument when the latter is
81
173
        # supplied.
82
174
        tasks.issue_power_action(
83
175
            sentinel.power_type, "on", mac_address=sentinel.mac_address)
84
176
        PowerAction.assert_called_once_with(sentinel.power_type)
85
177
        PowerAction.return_value.execute.assert_called_once_with(
86
178
            power_change="on", mac_address=sentinel.mac_address,
87
179
            ip_address=sentinel.ip_address)
88
180
89
181
    def test_ip_address_is_looked_up_when_already_supplied(self):
90
182
        # Patch out PowerAction; we're just trying to demonstrate that
91
183
        # it's invoked with an IP address even if one is not supplied.
92
184
        PowerAction = self.patch(tasks, "PowerAction")
93
185
        # find_ip_via_arp() is tested elsewhere; we just want to know
94
186
        # that it has been used.
95
187
        self.patch(tasks, "find_ip_via_arp").return_value = sentinel.ip_address
96
188
        # The ip_address argument passed to PowerAction.execute() is
97
189
        # looked-up via find_ip_via_arp() even if an ip_address is
98
190
        # passed into issue_power_action().
99
191
        tasks.issue_power_action(
100
192
            sentinel.power_type, "on", mac_address=sentinel.mac_address,
101
193
            ip_address=sentinel.another_ip_address)
102
194
        PowerAction.return_value.execute.assert_called_once_with(
103
195
            power_change="on", mac_address=sentinel.mac_address,
104
196
            ip_address=sentinel.ip_address)
105
197
106
198
107
161
class TestDHCPTasks(PservTestCase):
199
class TestDHCPTasks(PservTestCase):
108
162
200
109
163
    resources = (
201
    resources = (
Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)		2014-02-12	Approve on 2014-02-13
Review via email: mp+206057@code.launchpad.net