Commit c2c514a9 authored by Anael Beutot's avatar Anael Beutot
Browse files

Remove rshell_wait and renamed rshell methods handlers to shell

parent d4aec862

cloudcontrol/node/host/__init__.py

+4 −9
Original line number Diff line number Diff line
@@ -179,9 +179,8 @@ class Handler(BasePlugin): 
        self.rpc_handler.update(dict(

            execute_command=self.execute_command,

            node_shutdown=self.node_shutdown,

            rshell=self.rshell,

            rshell_resize=self.rshell_resize,

            rshell_wait=self.rshell_wait,

            shell=self.shell,

            resize=self.shell_resize,

            forward=self.forward,

            job_cancel=self.job_cancel,

            job_purge=self.job_purge,
@@ -315,7 +314,7 @@ class Handler(BasePlugin): 


    @threadless

    @pass_connection

    def rshell(self, conn, shell='/bin/bash'):

    def shell(self, conn, shell='/bin/bash'):

        """Create a shell tunnel and return the label of the created tunnel.



        """
@@ -324,14 +323,10 @@ class Handler(BasePlugin): 
        return remote_shell.label



    @threadless

    def rshell_resize(self, label, row, col, xpixel, ypixel):

    def shell_resize(self, label, row, col, xpixel, ypixel):

        """Resize the rshell."""

        self.shells[label].resize(row, col, xpixel, ypixel)



    def rshell_wait(self, label):

        """Wait for a tunnel termination."""

        return self.shells[label].wait_n_close()



    @pass_connection

    def forward(self, conn, label, port, destination='127.0.0.1'):

        # create socket