1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00

IOUCON start when vm start

This commit is contained in:
Julien Duponchelle 2015-02-11 15:57:02 +01:00
parent 986c63f344
commit faa7472670
4 changed files with 17 additions and 9 deletions

View File

@ -27,12 +27,15 @@ import signal
import re import re
import asyncio import asyncio
import shutil import shutil
import argparse
import threading
from pkg_resources import parse_version from pkg_resources import parse_version
from .iou_error import IOUError from .iou_error import IOUError
from ..adapters.ethernet_adapter import EthernetAdapter from ..adapters.ethernet_adapter import EthernetAdapter
from ..adapters.serial_adapter import SerialAdapter from ..adapters.serial_adapter import SerialAdapter
from ..base_vm import BaseVM from ..base_vm import BaseVM
from .ioucon import start_ioucon
import logging import logging
@ -50,9 +53,12 @@ class IOUVM(BaseVM):
:param project: Project instance :param project: Project instance
:param manager: parent VM Manager :param manager: parent VM Manager
:param console: TCP console port :param console: TCP console port
:params console_host: TCP console host IP
""" """
def __init__(self, name, vm_id, project, manager, console=None): def __init__(self, name, vm_id, project, manager,
console=None,
console_host="0.0.0.0"):
super().__init__(name, vm_id, project, manager) super().__init__(name, vm_id, project, manager)
@ -65,6 +71,7 @@ class IOUVM(BaseVM):
self._iou_path = None self._iou_path = None
self._iourc_path = None self._iourc_path = None
self._ioucon_thread = None self._ioucon_thread = None
self._console_host = console_host
# IOU settings # IOU settings
self._ethernet_adapters = [EthernetAdapter(), EthernetAdapter()] # one adapter = 4 interfaces self._ethernet_adapters = [EthernetAdapter(), EthernetAdapter()] # one adapter = 4 interfaces
@ -292,7 +299,7 @@ class IOUVM(BaseVM):
raise IOUError("could not start IOU {}: {}\n{}".format(self._iou_path, e, iou_stdout)) raise IOUError("could not start IOU {}: {}\n{}".format(self._iou_path, e, iou_stdout))
# start console support # start console support
# self._start_ioucon() self._start_ioucon()
# connections support # connections support
# self._start_iouyap() # self._start_iouyap()

View File

@ -32,6 +32,7 @@ def fake_iou_bin(tmpdir):
os.chmod(path, stat.S_IREAD | stat.S_IEXEC) os.chmod(path, stat.S_IREAD | stat.S_IEXEC)
return path return path
@pytest.fixture @pytest.fixture
def base_params(tmpdir, fake_iou_bin): def base_params(tmpdir, fake_iou_bin):
"""Return standard parameters""" """Return standard parameters"""