1
=== modified file 'src/provisioningserver/rpc/clusterservice.py'
2
--- src/provisioningserver/rpc/clusterservice.py	2014-09-17 10:57:10 +0000
3
+++ src/provisioningserver/rpc/clusterservice.py	2014-09-22 15:51:19 +0000
4
@@ -193,10 +193,10 @@
5
193
193
6
194
    @cluster.PowerQuery.responder
194
    @cluster.PowerQuery.responder
7
195
    def power_query(self, system_id, hostname, power_type, context):
195
    def power_query(self, system_id, hostname, power_type, context):
12
196
        state = get_power_state(
196
        d = get_power_state(
13
197
            system_id, hostname, power_type, power_change='query',
197
            system_id, hostname, power_type, context=context)
14
198
            context=context)
198
        d.addCallback(lambda x: {'state': x})
15
199
        return {'state': state}
199
        return d
16
200
200
17
201
    @cluster.ConfigureDHCPv4.responder
201
    @cluster.ConfigureDHCPv4.responder
18
202
    def configure_dhcpv4(self, omapi_key, subnet_configs):
202
    def configure_dhcpv4(self, omapi_key, subnet_configs):
19
203
203
20
=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
21
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-18 12:44:38 +0000
22
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-22 15:51:19 +0000
23
@@ -21,6 +21,7 @@
24
21
from itertools import product
21
from itertools import product
25
22
import json
22
import json
26
23
import os.path
23
import os.path
27
24
import random
28
24
from random import randint
25
from random import randint
29
25
from urlparse import urlparse
26
from urlparse import urlparse
30
26
27
31
@@ -61,6 +62,7 @@
32
61
    exceptions,
62
    exceptions,
33
62
    getRegionClient,
63
    getRegionClient,
34
63
    osystems as osystems_rpc_module,
64
    osystems as osystems_rpc_module,
35
65
    power as power_module,
36
64
    region,
66
    region,
37
65
    )
67
    )
38
66
from provisioningserver.rpc.clusterservice import (
68
from provisioningserver.rpc.clusterservice import (
39
@@ -74,6 +76,7 @@
40
74
    running_monitors,
76
    running_monitors,
41
75
    )
77
    )
42
76
from provisioningserver.rpc.osystems import gen_operating_systems
78
from provisioningserver.rpc.osystems import gen_operating_systems
43
79
from provisioningserver.rpc.power import QUERY_POWER_TYPES
44
77
from provisioningserver.rpc.testing import (
80
from provisioningserver.rpc.testing import (
45
78
    are_valid_tls_parameters,
81
    are_valid_tls_parameters,
46
79
    call_responder,
82
    call_responder,
47
@@ -989,6 +992,39 @@
48
989
        return d.addErrback(check)
992
        return d.addErrback(check)
49
990
993
50
991
994
51
995
class TestClusterProtocol_PowerQuery(MAASTestCase):
52
996
53
997
    run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)
54
998
55
999
    def test_is_registered(self):
56
1000
        protocol = Cluster()
57
1001
        responder = protocol.locateResponder(
58
1002
            cluster.PowerQuery.commandName)
59
1003
        self.assertIsNot(responder, None)
60
1004
61
1005
    @inlineCallbacks
62
1006
    def test_returns_power_state(self):
63
1007
        state = random.choice(['on', 'off'])
64
1008
        perform_power_query = self.patch(
65
1009
            power_module, "perform_power_query")
66
1010
        perform_power_query.return_value = state
67
1011
68
1012
        arguments = {
69
1013
            'system_id': factory.make_name(''),
70
1014
            'hostname': factory.make_name(''),
71
1015
            'power_type': random.choice(QUERY_POWER_TYPES),
72
1016
            'context': factory.make_name(''),
73
1017
        }
74
1018
        observed = yield call_responder(
75
1019
            Cluster(), cluster.PowerQuery, arguments)
76
1020
        self.assertEqual({'state': state}, observed)
77
1021
        self.assertThat(
78
1022
            perform_power_query,
79
1023
            MockCalledOnceWith(
80
1024
                arguments['system_id'], arguments['hostname'],
81
1025
                arguments['power_type'], arguments['context']))
82
1026
83
1027
84
992
class TestClusterProtocol_ConfigureDHCP(MAASTestCase):
1028
class TestClusterProtocol_ConfigureDHCP(MAASTestCase):
85
993
1029
86
994
    scenarios = (
1030
    scenarios = (
Reviewer	Review Type	Date Requested	Status
Graham Binns (community)		2014-09-22	Approve on 2014-09-22
Review via email: mp+235442@code.launchpad.net