1
=== modified file 'src/provisioningserver/rpc/clusterservice.py'
2
--- src/provisioningserver/rpc/clusterservice.py	2014-08-26 17:23:16 +0000
3
+++ src/provisioningserver/rpc/clusterservice.py	2014-09-02 09:30:41 +0000
4
@@ -14,7 +14,6 @@
5
14
__metaclass__ = type
14
__metaclass__ = type
6
15
__all__ = [
15
__all__ = [
7
16
    "ClusterClientService",
16
    "ClusterClientService",
8
17
    "ClusterService",
9
18
]
17
]
10
19
18
11
20
import json
19
import json
12
@@ -55,19 +54,14 @@
13
55
    change_power_state,
54
    change_power_state,
14
56
    get_power_state,
55
    get_power_state,
15
57
    )
56
    )
20
58
from twisted.application.internet import (
57
from twisted.application.internet import TimerService
17
59
    StreamServerEndpointService,
18
60
    TimerService,
19
61
    )
21
62
from twisted.internet import ssl
58
from twisted.internet import ssl
22
63
from twisted.internet.defer import inlineCallbacks
59
from twisted.internet.defer import inlineCallbacks
23
64
from twisted.internet.endpoints import (
60
from twisted.internet.endpoints import (
24
65
    connectProtocol,
61
    connectProtocol,
25
66
    TCP4ClientEndpoint,
62
    TCP4ClientEndpoint,
26
67
    TCP4ServerEndpoint,
27
68
    )
63
    )
28
69
from twisted.internet.error import ConnectError
64
from twisted.internet.error import ConnectError
29
70
from twisted.internet.protocol import Factory
30
71
from twisted.protocols import amp
65
from twisted.protocols import amp
31
72
from twisted.python import (
66
from twisted.python import (
32
73
    filepath,
67
    filepath,
33
@@ -223,19 +217,6 @@
34
223
        }
217
        }
35
224
218
36
225
219
37
226
class ClusterService(StreamServerEndpointService):
38
227
    """A cluster controller RPC service.
39
228
40
229
    This is a service - in the Twisted sense - that exposes the
41
230
    ``Cluster`` protocol on the given port.
42
231
    """
43
232
44
233
    def __init__(self, reactor, port):
45
234
        super(ClusterService, self).__init__(
46
235
            TCP4ServerEndpoint(reactor, port),
47
236
            Factory.forProtocol(Cluster))
48
237
49
238
50
239
@implementer(IConnection)
220
@implementer(IConnection)
51
240
class ClusterClient(Cluster):
221
class ClusterClient(Cluster):
52
241
    """The RPC protocol supported by a cluster controller, client version.
222
    """The RPC protocol supported by a cluster controller, client version.
53
242
223
54
=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
55
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-01 08:40:13 +0000
56
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-02 09:30:41 +0000
57
@@ -27,7 +27,6 @@
58
27
    MockCalledWith,
27
    MockCalledWith,
59
28
    MockCallsMatch,
28
    MockCallsMatch,
60
29
    MockNotCalled,
29
    MockNotCalled,
61
30
    Provides,
62
31
    )
30
    )
63
32
from maastesting.testcase import (
31
from maastesting.testcase import (
64
33
    MAASTestCase,
32
    MAASTestCase,
65
@@ -62,7 +61,6 @@
66
62
    Cluster,
61
    Cluster,
67
63
    ClusterClient,
62
    ClusterClient,
68
64
    ClusterClientService,
63
    ClusterClientService,
69
65
    ClusterService,
70
66
    )
64
    )
71
67
from provisioningserver.rpc.interfaces import IConnection
65
from provisioningserver.rpc.interfaces import IConnection
72
68
from provisioningserver.rpc.osystems import gen_operating_systems
66
from provisioningserver.rpc.osystems import gen_operating_systems
73
@@ -87,21 +85,13 @@
74
87
    MatchesListwise,
85
    MatchesListwise,
75
88
    MatchesStructure,
86
    MatchesStructure,
76
89
    )
87
    )
85
90
from twisted.application.internet import (
88
from twisted.application.internet import TimerService
86
91
    StreamServerEndpointService,
89
from twisted.internet import error
79
92
    TimerService,
80
93
    )
81
94
from twisted.internet import (
82
95
    error,
83
96
    reactor,
84
97
    )
87
98
from twisted.internet.defer import (
90
from twisted.internet.defer import (
88
99
    inlineCallbacks,
91
    inlineCallbacks,
89
100
    succeed,
92
    succeed,
90
101
    )
93
    )
91
102
from twisted.internet.endpoints import TCP4ClientEndpoint
94
from twisted.internet.endpoints import TCP4ClientEndpoint
92
103
from twisted.internet.interfaces import IStreamServerEndpoint
93
104
from twisted.internet.protocol import Factory
94
105
from twisted.internet.task import Clock
95
from twisted.internet.task import Clock
95
106
from twisted.protocols import amp
96
from twisted.protocols import amp
96
107
from twisted.test.proto_helpers import StringTransportWithDisconnection
97
from twisted.test.proto_helpers import StringTransportWithDisconnection
97
@@ -296,19 +286,6 @@
98
296
            JSON_POWER_TYPE_PARAMETERS, response["power_types"])
286
            JSON_POWER_TYPE_PARAMETERS, response["power_types"])
99
297
287
100
298
288
101
299
class TestClusterService(MAASTestCase):
102
300
103
301
    def test_init_sets_appropriate_instance_attributes(self):
104
302
        # ClusterService is a convenience wrapper around
105
303
        # StreamServerEndpointService. There's not much to demonstrate
106
304
        # other than it has been initialised correctly.
107
305
        service = ClusterService(reactor, 0)
108
306
        self.assertThat(service, IsInstance(StreamServerEndpointService))
109
307
        self.assertThat(service.endpoint, Provides(IStreamServerEndpoint))
110
308
        self.assertThat(service.factory, IsInstance(Factory))
111
309
        self.assertThat(service.factory.protocol, Equals(Cluster))
112
310
113
311
114
312
class TestClusterClientService(MAASTestCase):
289
class TestClusterClientService(MAASTestCase):
115
313
290
116
314
    run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)
291
    run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)
Status:	Merged
Approved by:	Julian Edwards on 2014-09-02
Approved revision:	no longer in the source branch.
Merged at revision:	2870
Proposed branch:	lp:~julian-edwards/maas/remove-old-code
Merge into:	lp:~maas-committers/maas/trunk
Diff against target:	116 lines (+3/-45) 2 files modified src/provisioningserver/rpc/clusterservice.py (+1/-20) src/provisioningserver/rpc/tests/test_clusterservice.py (+2/-25)
To merge this branch:	bzr merge lp:~julian-edwards/maas/remove-old-code
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)	selfie		Approve on 2014-09-02
Review via email: mp+232963@code.launchpad.net