Commit 5fa561b7 authored by Anael Beutot's avatar Anael Beutot
Browse files

Updated tunnel handlers

parent 63e3d25f

cloudcontrol/node/hypervisor/__init__.py

+5 −3
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ class Handler(HostHandler): 
        """

        logger.debug('Tunnel setup: local = %s', local)

        # create job

        job = self.main.job_manager.create(TCPTunnel, self.main.evloop)

        job = self.main.job_manager.create(TCPTunnel)

        job.setup_listen('127.0.0.1' if local else '0.0.0.0')

        return dict(

            jid=job.id,
@@ -675,6 +675,7 @@ class Handler(HostHandler): 
        logger.debug('Tunnel connect %s %s', res['jid'], remote_ip)

        job = self.main.job_manager.get(res['jid'])

        job.setup_connect((remote_ip, remote_res['port']))

        job.start()



    @threadless

    def tun_connect_hv(self, res, migration=False):
@@ -685,6 +686,7 @@ class Handler(HostHandler): 
        logger.debug('Tunnel connect hypervisor %s', res['jid'])

        job = self.main.job_manager.get(res['jid'])

        job.setup_connect('/var/run/libvirt/libvirt-sock')

        job.start()



    @threadless

    def tun_destroy(self, res):
@@ -693,8 +695,8 @@ class Handler(HostHandler): 
        :param res: previous result as givent by `tun_setup` handler

        """

        logger.debug('Tunnel destroy %s', res['jid'])

        self.main.job_manager.cancel(res['jid'])

        self.main.job_manager.remove(res['jid'])

        job = self.main.job_manager.get(res['jid'])

        job.wait()



    def drbd_setup(self, pool, name):

        """Create DRBD volumes.