mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-24 15:58:08 +00:00
IOU support nio ethernet
This commit is contained in:
parent
3e1875b069
commit
1550ca01e6
@ -34,6 +34,7 @@ from .project_manager import ProjectManager
|
|||||||
|
|
||||||
from .nios.nio_udp import NIO_UDP
|
from .nios.nio_udp import NIO_UDP
|
||||||
from .nios.nio_tap import NIO_TAP
|
from .nios.nio_tap import NIO_TAP
|
||||||
|
from .nios.nio_generic_ethernet import NIO_GenericEthernet
|
||||||
|
|
||||||
|
|
||||||
class BaseManager:
|
class BaseManager:
|
||||||
@ -280,5 +281,7 @@ class BaseManager:
|
|||||||
if not self._has_privileged_access(executable):
|
if not self._has_privileged_access(executable):
|
||||||
raise aiohttp.web.HTTPForbidden(text="{} has no privileged access to {}.".format(executable, tap_device))
|
raise aiohttp.web.HTTPForbidden(text="{} has no privileged access to {}.".format(executable, tap_device))
|
||||||
nio = NIO_TAP(tap_device)
|
nio = NIO_TAP(tap_device)
|
||||||
|
elif nio_settings["type"] == "nio_generic_ethernet":
|
||||||
|
nio = NIO_GenericEthernet(nio_settings["ethernet_device"])
|
||||||
assert nio is not None
|
assert nio is not None
|
||||||
return nio
|
return nio
|
||||||
|
54
gns3server/modules/nios/nio_generic_ethernet.py
Normal file
54
gns3server/modules/nios/nio_generic_ethernet.py
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# Copyright (C) 2013 GNS3 Technologies Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
"""
|
||||||
|
Interface for generic Ethernet NIOs (PCAP library).
|
||||||
|
"""
|
||||||
|
|
||||||
|
from .nio import NIO
|
||||||
|
|
||||||
|
|
||||||
|
class NIO_GenericEthernet(NIO):
|
||||||
|
"""
|
||||||
|
Generic Ethernet NIO.
|
||||||
|
|
||||||
|
:param ethernet_device: Ethernet device name (e.g. eth0)
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, ethernet_device):
|
||||||
|
|
||||||
|
NIO.__init__(self)
|
||||||
|
self._ethernet_device = ethernet_device
|
||||||
|
|
||||||
|
@property
|
||||||
|
def ethernet_device(self):
|
||||||
|
"""
|
||||||
|
Returns the Ethernet device used by this NIO.
|
||||||
|
|
||||||
|
:returns: the Ethernet device name
|
||||||
|
"""
|
||||||
|
|
||||||
|
return self._ethernet_device
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
|
||||||
|
return "NIO Ethernet"
|
||||||
|
|
||||||
|
def __json__(self):
|
||||||
|
|
||||||
|
return {"type": "nio_generic_ethernet",
|
||||||
|
"ethernet_device": self._ethernet_device}
|
@ -146,6 +146,17 @@ def test_iou_nio_create_udp(server, vm):
|
|||||||
assert response.json["type"] == "nio_udp"
|
assert response.json["type"] == "nio_udp"
|
||||||
|
|
||||||
|
|
||||||
|
def test_iou_nio_create_ethernet(server, vm):
|
||||||
|
response = server.post("/projects/{project_id}/iou/vms/{vm_id}/ports/0/nio".format(project_id=vm["project_id"], vm_id=vm["vm_id"]), {"type": "nio_generic_ethernet",
|
||||||
|
"ethernet_device": "eth0",
|
||||||
|
},
|
||||||
|
example=True)
|
||||||
|
assert response.status == 201
|
||||||
|
assert response.route == "/projects/{project_id}/iou/vms/{vm_id}/ports/{port_number:\d+}/nio"
|
||||||
|
assert response.json["type"] == "nio_generic_ethernet"
|
||||||
|
assert response.json["ethernet_device"] == "eth0"
|
||||||
|
|
||||||
|
|
||||||
def test_iou_nio_create_tap(server, vm):
|
def test_iou_nio_create_tap(server, vm):
|
||||||
with patch("gns3server.modules.base_manager.BaseManager._has_privileged_access", return_value=True):
|
with patch("gns3server.modules.base_manager.BaseManager._has_privileged_access", return_value=True):
|
||||||
response = server.post("/projects/{project_id}/iou/vms/{vm_id}/ports/0/nio".format(project_id=vm["project_id"], vm_id=vm["vm_id"]), {"type": "nio_tap",
|
response = server.post("/projects/{project_id}/iou/vms/{vm_id}/ports/0/nio".format(project_id=vm["project_id"], vm_id=vm["vm_id"]), {"type": "nio_tap",
|
||||||
|
Loading…
Reference in New Issue
Block a user