NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

VCPS create NIO work and tested

Browse Source
This commit is contained in:
Julien Duponchelle committed 2015-01-16 16:20:10 +01:00
1 parent aff834f565
commit 0cdc1c3042
7 files changed
+90 -187
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/handlers/vpcs_handler.py
+10 -25
View File
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from ..web.route import Route
from ..schemas.vpcs import VPCS_CREATE_SCHEMA
from ..schemas.vpcs import VPCS_OBJECT_SCHEMA
@@ -72,32 +73,9 @@ class VPCSHandler(object):
vm = yield from vpcs_manager.stop_vm(int(request.match_info['vpcs_id']))
response.json({})
@classmethod
@Route.get(
r"/vpcs/{vpcs_id}",
parameters={
"vpcs_id": "Id of VPCS instance"
},
description="Get information about a VPCS",
output=VPCS_OBJECT_SCHEMA)
def show(request, response):
response.json({'name': "PC 1", "vpcs_id": 42, "console": 4242})
@classmethod
@Route.put(
r"/vpcs/{vpcs_id}",
parameters={
"vpcs_id": "Id of VPCS instance"
},
description="Update VPCS information",
input=VPCS_OBJECT_SCHEMA,
output=VPCS_OBJECT_SCHEMA)
def update(request, response):
response.json({'name': "PC 1", "vpcs_id": 42, "console": 4242})
@classmethod
@Route.post(
r"/vpcs/{vpcs_id}/nio",
r"/vpcs/{vpcs_id}/ports/{port_id}/nio",
parameters={
"vpcs_id": "Id of VPCS instance"
},
@@ -108,5 +86,12 @@ class VPCSHandler(object):
description="ADD NIO to a VPCS",
input=VPCS_ADD_NIO_SCHEMA)
def create_nio(request, response):
# TODO: raise 404 if VPCS not found
# TODO: raise 404 if VPCS not found GET VM can raise an exeption
# TODO: response with nio
vpcs_manager = VPCS.instance()
vm = vpcs_manager.get_vm(int(request.match_info['vpcs_id']))
vm.port_add_nio_binding(int(request.match_info['port_id']), request.json)
response.json({'name': "PC 2", "vpcs_id": 42, "console": 4242})
gns3server/modules/base_manager.py
+3 -3
View File
@@ -48,7 +48,7 @@ class BaseManager:
def destroy(cls):
cls._instance = None
def _get_vm_instance(self, vm_id):
def get_vm(self, vm_id):
"""
Returns a VM instance.
@@ -80,10 +80,10 @@ class BaseManager:
@asyncio.coroutine
def start_vm(self, vm_id):
vm = self._get_vm_instance(vm_id)
vm = self.get_vm(vm_id)
yield from vm.start()
@asyncio.coroutine
def stop_vm(self, vm_id):
vm = self._get_vm_instance(vm_id)
vm = self.get_vm(vm_id)
yield from vm.stop()
gns3server/modules/vpcs/vpcs_device.py
+30 -3
View File
@@ -27,12 +27,14 @@ import signal
import shutil
import re
import asyncio
import socket
from pkg_resources import parse_version
from .vpcs_error import VPCSError
from .adapters.ethernet_adapter import EthernetAdapter
from .nios.nio_udp import NIO_UDP
from .nios.nio_tap import NIO_TAP
from ..attic import has_privileged_access
from ..base_vm import BaseVM
@@ -168,8 +170,8 @@ class VPCSDevice(BaseVM):
"""
if not self.is_running():
# if not self._ethernet_adapter.get_nio(0):
# raise VPCSError("This VPCS instance must be connected in order to start")
if not self._ethernet_adapter.get_nio(0):
raise VPCSError("This VPCS instance must be connected in order to start")
self._command = self._build_command()
try:
@@ -237,7 +239,7 @@ class VPCSDevice(BaseVM):
return True
return False
def port_add_nio_binding(self, port_id, nio):
def port_add_nio_binding(self, port_id, nio_settings):
"""
Adds a port NIO binding.
@@ -249,11 +251,34 @@ class VPCSDevice(BaseVM):
raise VPCSError("Port {port_id} doesn't exist in adapter {adapter}".format(adapter=self._ethernet_adapter,
port_id=port_id))
nio = None
if nio_settings["type"] == "nio_udp":
lport = nio_settings["lport"]
rhost = nio_settings["rhost"]
rport = nio_settings["rport"]
try:
#TODO: handle IPv6
with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock:
sock.connect((rhost, rport))
except OSError as e:
raise VPCSError("Could not create an UDP connection to {}:{}: {}".format(rhost, rport, e))
nio = NIO_UDP(lport, rhost, rport)
elif nio_settings["type"] == "nio_tap":
tap_device = nio_settings["tap_device"]
print(has_privileged_access)
if not has_privileged_access(self._path):
raise VPCSError("{} has no privileged access to {}.".format(self._path, tap_device))
nio = NIO_TAP(tap_device)
if not nio:
raise VPCSError("Requested NIO does not exist or is not supported: {}".format(nio_settings["type"]))
self._ethernet_adapter.add_nio(port_id, nio)
log.info("VPCS {name} [id={id}]: {nio} added to port {port_id}".format(name=self._name,
id=self._id,
nio=nio,
port_id=port_id))
return nio
def port_remove_nio_binding(self, port_id):
"""
@@ -317,6 +342,8 @@ class VPCSDevice(BaseVM):
nio = self._ethernet_adapter.get_nio(0)
if nio:
print(nio)
print(isinstance(nio, NIO_UDP))
if isinstance(nio, NIO_UDP):
# UDP tunnel
command.extend(["-s", str(nio.lport)]) # source UDP port
gns3server/schemas/vpcs.py
+6 -149
View File
@@ -75,36 +75,6 @@ VPCS_ADD_NIO_SCHEMA = {
"required": ["type", "lport", "rhost", "rport"],
"additionalProperties": False
},
"Ethernet": {
"description": "Generic Ethernet Network Input/Output",
"properties": {
"type": {
"enum": ["nio_generic_ethernet"]
},
"ethernet_device": {
"description": "Ethernet device name e.g. eth0",
"type": "string",
"minLength": 1
},
},
"required": ["type", "ethernet_device"],
"additionalProperties": False
},
"LinuxEthernet": {
"description": "Linux Ethernet Network Input/Output",
"properties": {
"type": {
"enum": ["nio_linux_ethernet"]
},
"ethernet_device": {
"description": "Ethernet device name e.g. eth0",
"type": "string",
"minLength": 1
},
},
"required": ["type", "ethernet_device"],
"additionalProperties": False
},
"TAP": {
"description": "TAP Network Input/Output",
"properties": {
@@ -120,89 +90,14 @@ VPCS_ADD_NIO_SCHEMA = {
"required": ["type", "tap_device"],
"additionalProperties": False
},
"UNIX": {
"description": "UNIX Network Input/Output",
"properties": {
"type": {
"enum": ["nio_unix"]
},
"local_file": {
"description": "path to the UNIX socket file (local)",
"type": "string",
"minLength": 1
},
"remote_file": {
"description": "path to the UNIX socket file (remote)",
"type": "string",
"minLength": 1
},
},
"required": ["type", "local_file", "remote_file"],
"additionalProperties": False
},
"VDE": {
"description": "VDE Network Input/Output",
"properties": {
"type": {
"enum": ["nio_vde"]
},
"control_file": {
"description": "path to the VDE control file",
"type": "string",
"minLength": 1
},
"local_file": {
"description": "path to the VDE control file",
"type": "string",
"minLength": 1
},
},
"required": ["type", "control_file", "local_file"],
"additionalProperties": False
},
"NULL": {
"description": "NULL Network Input/Output",
"properties": {
"type": {
"enum": ["nio_null"]
},
},
"required": ["type"],
"additionalProperties": False
},
},
"properties": {
"id": {
"description": "VPCS device instance ID",
"type": "integer"
},
"port_id": {
"description": "Unique port identifier for the VPCS instance",
"type": "integer"
},
"port": {
"description": "Port number",
"type": "integer",
"minimum": 0,
"maximum": 0
},
"nio": {
"type": "object",
"description": "Network Input/Output",
"oneOf": [
{"$ref": "#/definitions/UDP"},
{"$ref": "#/definitions/Ethernet"},
{"$ref": "#/definitions/LinuxEthernet"},
{"$ref": "#/definitions/TAP"},
{"$ref": "#/definitions/UNIX"},
{"$ref": "#/definitions/VDE"},
{"$ref": "#/definitions/NULL"},
]
},
},
"additionalProperties": False,
"required": ["id", "port_id", "port", "nio"]
"oneOf": [
{"$ref": "#/definitions/UDP"},
{"$ref": "#/definitions/TAP"},
],
"additionalProperties": True,
"required": ['type']
}
VPCS_OBJECT_SCHEMA = {
@@ -230,41 +125,3 @@ VPCS_OBJECT_SCHEMA = {
"required": ["name", "vpcs_id", "console"]
}
VBOX_CREATE_SCHEMA = {
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Request validation to create a new VirtualBox VM instance",
"type": "object",
"properties": {
"name": {
"description": "VirtualBox VM instance name",
"type": "string",
"minLength": 1,
},
"vbox_id": {
"description": "VirtualBox VM instance ID",
"type": "integer"
},
},
"additionalProperties": False,
"required": ["name"],
}
VBOX_OBJECT_SCHEMA = {
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "VirtualBox instance",
"type": "object",
"properties": {
"name": {
"description": "VirtualBox VM name",
"type": "string",
"minLength": 1,
},
"vbox_id": {
"description": "VirtualBox VM instance ID",
"type": "integer"
},
},
"additionalProperties": False,
"required": ["name", "vbox_id"]
}