← Back to branch summary

~lutostag/ubuntu/trusty/maas/1.5.4+keystone

« back to all changes in this revision

Viewing changes to src/provisioningserver/plugin.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2014-02-15 12:08:23 UTC
  • mto: This revision was merged to the branch mainline in revision 48.
  • Revision ID: package-import@ubuntu.com-20140215120823-u7dkitfy0h8tbruh
Tags: upstream-1.5+bzr1948
Import upstream version 1.5+bzr1948

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/plugin.py
16
16
 
17
17
from provisioningserver.amqpclient import AMQFactory
18
18
from provisioningserver.config import Config
19
 
from provisioningserver.rpc.clusterservice import ClusterService
 
19
from provisioningserver.rpc.clusterservice import ClusterClientService
20
20
from provisioningserver.services import (
21
21
    LogService,
22
22
    OOPSService,
23
23
    )
24
 
from provisioningserver.tftp import TFTPBackend
25
 
from provisioningserver.utils import get_all_interface_addresses
26
 
from tftp.protocol import TFTP
27
 
from twisted.application import internet
 
24
from provisioningserver.tftp import TFTPService
28
25
from twisted.application.internet import (
29
26
    TCPClient,
30
27
    TCPServer,
154
151
 
155
152
    def _makeTFTPService(self, tftp_config):
156
153
        """Create the dynamic TFTP service."""
157
 
        backend = TFTPBackend(tftp_config["root"], tftp_config["generator"])
158
 
        # Create a UDP server individually for each discovered network
159
 
        # interface, so that we can detect the interface via which we have
160
 
        # received a datagram.
161
 
        tftp_services = MultiService()
162
 
        tftp_services.setName("tftp")
163
 
        for address in get_all_interface_addresses():
164
 
            tftp_service = internet.UDPServer(
165
 
                tftp_config["port"], TFTP(backend), interface=address)
166
 
            tftp_service.setName(address)
167
 
            tftp_service.setServiceParent(tftp_services)
168
 
        return tftp_services
 
154
        tftp_service = TFTPService(**tftp_config)
 
155
        tftp_service.setName("tftp")
 
156
        return tftp_service
169
157
 
170
158
    def _makeRPCService(self, rpc_config):
171
 
        rpc_service = ClusterService(reactor, rpc_config["port"])
 
159
        rpc_service = ClusterClientService(reactor)
172
160
        rpc_service.setName("rpc")
173
161
        return rpc_service
174
162