arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-13 01:20:58 +00:00
Code Issues Releases Wiki Activity

WebSocket binary mode support for docker

Browse Source
This commit is contained in:
ziajka 2017-07-06 10:13:00 +02:00
parent c6f9ec3758
commit 8e8b8bc5a5
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/compute/docker/docker_vm.py
View File

@ -500,9 +500,11 @@ class DockerVM(BaseNode):
while True: while True:
msg = yield from ws.receive() msg = yield from ws.receive()
if msg.tp == aiohttp.MsgType.text: if msg.tp == aiohttp.MsgType.TEXT:
out.feed_data(msg.data.encode()) out.feed_data(msg.data.encode())
elif msg.tp == aiohttp.MsgType.error: if msg.tp == aiohttp.MsgType.BINARY:
out.feed_data(msg.data)
elif msg.tp == aiohttp.MsgType.ERROR:
log.critical("Docker WebSocket Error: {}".format(msg.data)) log.critical("Docker WebSocket Error: {}".format(msg.data))
else: else:
out.feed_eof() out.feed_eof()

25
tests/compute/docker/test_docker_vm.py
View File

@ -20,6 +20,7 @@ import pytest
import uuid import uuid
import sys import sys
import os import os
from aiohttp._ws_impl import WSMsgType
from tests.utils import asyncio_patch, AsyncioMagicMock from tests.utils import asyncio_patch, AsyncioMagicMock
from gns3server.ubridge.ubridge_error import UbridgeNamespaceError from gns3server.ubridge.ubridge_error import UbridgeNamespaceError
@ -904,3 +905,27 @@ def test_fix_permission(vm, loop):
loop.run_until_complete(vm._fix_permissions()) loop.run_until_complete(vm._fix_permissions())
mock_exec.assert_called_with('docker', 'exec', 'e90e34656842', '/gns3/bin/busybox', 'sh', '-c', '(/gns3/bin/busybox find "/etc" -depth -print0 | /gns3/bin/busybox xargs -0 /gns3/bin/busybox stat -c \'%a:%u:%g:%n\' > "/etc/.gns3_perms") && /gns3/bin/busybox chmod -R u+rX "/etc" && /gns3/bin/busybox chown {}:{} -R "/etc"'.format(os.getuid(), os.getgid())) mock_exec.assert_called_with('docker', 'exec', 'e90e34656842', '/gns3/bin/busybox', 'sh', '-c', '(/gns3/bin/busybox find "/etc" -depth -print0 | /gns3/bin/busybox xargs -0 /gns3/bin/busybox stat -c \'%a:%u:%g:%n\' > "/etc/.gns3_perms") && /gns3/bin/busybox chmod -R u+rX "/etc" && /gns3/bin/busybox chown {}:{} -R "/etc"'.format(os.getuid(), os.getgid()))
assert process.wait.called assert process.wait.called
def test_read_console_output_with_binary_mode(vm, loop):
class InputStreamMock(object):
def __init__(self):
self.sent = False
@asyncio.coroutine
def receive(self):
if not self.sent:
self.sent = True
return MagicMock(tp=WSMsgType.BINARY, data=b"test")
else:
return MagicMock(tp=WSMsgType.CLOSE)
def close(self):
pass
input_stream = InputStreamMock()
output_stream = MagicMock()
with asyncio_patch('gns3server.compute.docker.docker_vm.DockerVM.stop'):
loop.run_until_complete(asyncio.async(vm._read_console_output(input_stream, output_stream)))
output_stream.feed_data.assert_called_once_with(b"test")