arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
This commit is contained in:
grossmj 2018-04-18 17:08:42 +08:00
commit 2ea0aa5ded
29 changed files with 291 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST.in
View File

@ -1,6 +1,5 @@
include README.rst include README.rst
include AUTHORS include AUTHORS
include INSTALL
include LICENSE include LICENSE
include MANIFEST.in include MANIFEST.in
include tox.ini include tox.ini

4
gns3server/appliances/cisco-7200.gns3a
View File

@ -22,14 +22,14 @@
"images": [ "images": [
{ {
"filename": "c7200-adventerprisek9-mz.124-24.T5.image", "filename": "c7200-adventerprisek9-mz.124-24.T5.image",
"version": "124-25.T5", "version": "124-24.T5",
"md5sum": "6b89d0d804e1f2bb5b8bda66b5692047", "md5sum": "6b89d0d804e1f2bb5b8bda66b5692047",
"filesize": 102345240 "filesize": 102345240
} }
], ],
"versions": [ "versions": [
{ {
"name": "124-25.T5", "name": "124-24.T5",
"idlepc": "0x606df838", "idlepc": "0x606df838",
"images": { "images": {
"image": "c7200-adventerprisek9-mz.124-24.T5.image" "image": "c7200-adventerprisek9-mz.124-24.T5.image"

14
gns3server/appliances/cisco-nxosv9k.gns3a
View File

@ -25,6 +25,13 @@
"kvm": "require" "kvm": "require"
}, },
"images": [ "images": [
{
"filename": "nxosv-final.7.0.3.I7.3.qcow2",
"version": "7.0.3.I7.3",
"md5sum": "9d7a20367bf681a239f14097bbce470a",
"filesize": 983629824,
"download_url": "https://software.cisco.com/download/"
},
{ {
"filename": "nxosv-final.7.0.3.I7.2.qcow2", "filename": "nxosv-final.7.0.3.I7.2.qcow2",
"version": "7.0.3.I7.2", "version": "7.0.3.I7.2",
@ -71,6 +78,13 @@
} }
], ],
"versions": [ "versions": [
{
"name": "7.0.3.I7.3",
"images": {
"bios_image": "OVMF-20160813.fd",
"hda_disk_image": "nxosv-final.7.0.3.I7.3.qcow2"
}
},
{ {
"name": "7.0.3.I7.2", "name": "7.0.3.I7.2",
"images": { "images": {

13
gns3server/appliances/citrix-netscaler-vpx.gns3a
View File

@ -26,6 +26,13 @@
"options": "-smp 2 -cpu host" "options": "-smp 2 -cpu host"
}, },
"images": [ "images": [
{
"filename": "NSVPX-KVM-12.0-56.20_nc_32.qcow2",
"version": "12.0-56.20",
"md5sum": "0ea1c23e3b8eb8451037d46ee472cfa6",
"filesize": 739704832,
"download_url": "https://www.citrix.com/lp/try/netscaler-vpx-express.html"
},
{ {
"filename": "NSVPX-KVM-11.1-47.14_nc.raw", "filename": "NSVPX-KVM-11.1-47.14_nc.raw",
"version": "11.1-47.14 F", "version": "11.1-47.14 F",
@ -42,6 +49,12 @@
} }
], ],
"versions": [ "versions": [
{
"name": "12.0-56.20",
"images": {
"hda_disk_image": "NSVPX-KVM-12.0-56.20_nc_32.qcow2"
}
},
{ {
"name": "11.1-47.14 F", "name": "11.1-47.14 F",
"images": { "images": {

1
gns3server/appliances/juniper-vsrx.gns3a
View File

@ -12,6 +12,7 @@
"maintainer": "GNS3 Team", "maintainer": "GNS3 Team",
"maintainer_email": "developers@gns3.net", "maintainer_email": "developers@gns3.net",
"usage": "Initial username is root, no password.", "usage": "Initial username is root, no password.",
"first_port_name": "fxp0",
"port_name_format": "ge-0/0/{0}", "port_name_format": "ge-0/0/{0}",
"qemu": { "qemu": {
"adapter_type": "e1000", "adapter_type": "e1000",

39
gns3server/appliances/mikrotik-chr.gns3a
View File

@ -26,6 +26,33 @@
"options": "-nographic" "options": "-nographic"
}, },
"images": [ "images": [
{
"filename": "chr-6.42.img",
"version": "6.42",
"md5sum": "279bb518497b40f41c8585128916a2fb",
"filesize": 134217728,
"download_url": "http://www.mikrotik.com/download",
"direct_download_url": "https://download2.mikrotik.com/routeros/6.42/chr-6.42.img.zip",
"compression": "zip"
},
{
"filename": "chr-6.41.4.img",
"version": "6.41.4",
"md5sum": "63b555b2b7f0d78b79edb92f7e7d2ed7",
"filesize": 134217728,
"download_url": "http://www.mikrotik.com/download",
"direct_download_url": "https://download2.mikrotik.com/routeros/6.41.4/chr-6.41.4.img.zip",
"compression": "zip"
},
{
"filename": "chr-6.40.7.img",
"version": "6.40.7",
"md5sum": "424b897d631c4cac4324ca310e81b494",
"filesize": 134217728,
"download_url": "http://www.mikrotik.com/download",
"direct_download_url": "https://download2.mikrotik.com/routeros/6.40.7/chr-6.40.7.img.zip",
"compression": "zip"
},
{ {
"filename": "chr-6.40.5.img", "filename": "chr-6.40.5.img",
"version": "6.40.5", "version": "6.40.5",
@ -235,6 +262,18 @@
} }
], ],
"versions": [ "versions": [
{
"name": "6.41.4",
"images": {
"hda_disk_image": "chr-6.41.4.img"
}
},
{
"name": "6.40.7",
"images": {
"hda_disk_image": "chr-6.40.7.img"
}
},
{ {
"name": "6.40.5", "name": "6.40.5",
"images": { "images": {

76
gns3server/appliances/pan-vm-fw.gns3a
View File

@ -27,17 +27,31 @@
}, },
"images": [ "images": [
{ {
"filename": "PA-VM-ESX-6.1.0-disk1.vmdk", "filename": "PA-VM-ESX-8.1.0-disk1.vmdk",
"version": "6.1.0 (ESX)", "version": "8.1.0",
"md5sum": "64b1e81cd54008318235832ea6d71424", "md5sum": "49af8e8225c2e90414bde0be15eaf421",
"filesize": 2959736832, "filesize": 2281454080,
"download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/" "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
}, },
{ {
"filename": "PA-VM-KVM-7.1.0.qcow2", "filename": "PA-VM-KVM-8.1.0.qcow2",
"version": "7.1.0", "version": "8.1.0",
"md5sum": "da300253709740068927408239c2e321", "md5sum": "459558515b965b2e43fde2842abbae66",
"filesize": 1858797568, "filesize": 2260467712,
"download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
},
{
"filename": "PA-VM-ESX-8.0.0-disk1.vmdk",
"version": "8.0.0",
"md5sum": "a505fb1dbcc855ecf98630fd5d329f9a",
"filesize": 2002713088,
"download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
},
{
"filename": "PA-VM-KVM-8.0.0.qcow2",
"version": "8.0.0",
"md5sum": "b6a1ddc8552aff87f05f9c0d4cb54dc3",
"filesize": 1987444736,
"download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/" "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
}, },
{ {
@ -48,25 +62,43 @@
"download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/" "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
}, },
{ {
"filename": "PA-VM-KVM-8.0.0.qcow2", "filename": "PA-VM-KVM-7.1.0.qcow2",
"version": "8.0.0", "version": "7.1.0",
"md5sum": "b6a1ddc8552aff87f05f9c0d4cb54dc3", "md5sum": "da300253709740068927408239c2e321",
"filesize": 1987444736, "filesize": 1858797568,
"download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
},
{
"filename": "PA-VM-ESX-6.1.0-disk1.vmdk",
"version": "6.1.0 (ESX)",
"md5sum": "64b1e81cd54008318235832ea6d71424",
"filesize": 2959736832,
"download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/" "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
} }
], ],
"versions": [ "versions": [
{ {
"name": "6.1.0 (ESX)", "name": "8.1.0 (ESX)",
"images": { "images": {
"hda_disk_image": "PA-VM-ESX-6.1.0-disk1.vmdk" "hda_disk_image": "PA-VM-ESX-8.1.0-disk1.vmdk"
} }
}, },
{ {
"name": "7.1.0", "name": "8.1.0",
"images": { "images": {
"hda_disk_image": "PA-VM-KVM-7.1.0.qcow2" "hda_disk_image": "PA-VM-KVM-8.1.0.qcow2"
}
},
{
"name": "8.0.0 (ESX)",
"images": {
"hda_disk_image": "PA-VM-ESX-8.0.0-disk1.vmdk2"
}
},
{
"name": "8.0.0",
"images": {
"hda_disk_image": "PA-VM-KVM-8.0.0.qcow2"
} }
}, },
{ {
@ -76,9 +108,15 @@
} }
}, },
{ {
"name": "8.0.0", "name": "7.1.0",
"images": { "images": {
"hda_disk_image": "PA-VM-KVM-8.0.0.qcow2" "hda_disk_image": "PA-VM-KVM-7.1.0.qcow2"
}
},
{
"name": "6.1.0 (ESX)",
"images": {
"hda_disk_image": "PA-VM-ESX-6.1.0-disk1.vmdk"
} }
} }
] ]

38
gns3server/appliances/ubuntu-cloud.gns3a
View File

@ -28,37 +28,30 @@
{ {
"filename": "ubuntu-17.10-server-cloudimg-amd64.img", "filename": "ubuntu-17.10-server-cloudimg-amd64.img",
"version": "17.10", "version": "17.10",
"md5sum": "5d221878d8b2e49c5de7ebb58a2b35e3", "md5sum": "331b44f2b05858c251b3ea92c8b65152",
"filesize": 318373888, "filesize": 320405504,
"download_url": "https://cloud-images.ubuntu.com/releases/17.10/release/" "download_url": "https://cloud-images.ubuntu.com/releases/17.10/release-20180404/ubuntu-17.10-server-cloudimg-amd64.img"
},
{
"filename": "ubuntu-17.04-server-cloudimg-amd64.img",
"version": "17.04",
"md5sum": "d4da8157dbf2e64f2fa1fb5d121398e5",
"filesize": 351993856,
"download_url": "https://cloud-images.ubuntu.com/releases/17.04/release/"
}, },
{ {
"filename": "ubuntu-16.04-server-cloudimg-amd64-disk1.img", "filename": "ubuntu-16.04-server-cloudimg-amd64-disk1.img",
"version": "16.04.3", "version": "16.04",
"md5sum": "bd0c168a83b1f483bd240b3d874edd6c", "md5sum": "22c124ba65ea096cdef8b0a197dd613a",
"filesize": 288686080, "filesize": 290193408,
"download_url": "https://cloud-images.ubuntu.com/releases/16.04/release/" "download_url": "https://cloud-images.ubuntu.com/releases/16.04/release-20180405/ubuntu-16.04-server-cloudimg-amd64-disk1.img"
}, },
{ {
"filename": "ubuntu-14.04-server-cloudimg-amd64-disk1.img", "filename": "ubuntu-14.04-server-cloudimg-amd64-disk1.img",
"version": "14.04.5", "version": "14.04",
"md5sum": "d7b4112c7d797e5e77ef9995d06a76f1", "md5sum": "d11b89321d41d0eeddcacf73bf0d2262",
"filesize": 262406656, "filesize": 262668800,
"download_url": "https://cloud-images.ubuntu.com/releases/14.04/release/" "download_url": "https://cloud-images.ubuntu.com/releases/14.04/release-20180404/ubuntu-14.04-server-cloudimg-amd64-disk1.img"
}, },
{ {
"filename": "ubuntu-cloud-init-data.iso", "filename": "ubuntu-cloud-init-data.iso",
"version": "1.0", "version": "1.0",
"md5sum": "328469100156ae8dbf262daa319c27ff", "md5sum": "328469100156ae8dbf262daa319c27ff",
"filesize": 131072, "filesize": 131072,
"download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/ubuntu-cloud-init-data.iso/download" "download_url": "https://github.com/asenci/gns3-ubuntu-cloud-init-data/raw/master/ubuntu-cloud-init-data.iso"
} }
], ],
"versions": [ "versions": [
@ -69,13 +62,6 @@
"cdrom_image": "ubuntu-cloud-init-data.iso" "cdrom_image": "ubuntu-cloud-init-data.iso"
} }
}, },
{
"name": "17.04",
"images": {
"hda_disk_image": "ubuntu-17.04-server-cloudimg-amd64.img",
"cdrom_image": "ubuntu-cloud-init-data.iso"
}
},
{ {
"name": "16.04 (LTS)", "name": "16.04 (LTS)",
"images": { "images": {

7
gns3server/appliances/vyos.gns3a
View File

@ -80,6 +80,13 @@
"cdrom_image": "vyos-1.2.0-beta1-amd64.iso" "cdrom_image": "vyos-1.2.0-beta1-amd64.iso"
} }
}, },
{
"name": "1.1.8",
"images": {
"hda_disk_image": "empty8G.qcow2",
"cdrom_image": "vyos-1.1.8-amd64.iso"
}
},
{ {
"name": "1.1.7", "name": "1.1.7",
"images": { "images": {

3
gns3server/compute/base_node.py
View File

@ -360,6 +360,7 @@ class BaseNode:
remaining_trial -= 1 remaining_trial -= 1
yield from AsyncioTelnetServer.write_client_intro(writer, echo=True) yield from AsyncioTelnetServer.write_client_intro(writer, echo=True)
server = AsyncioTelnetServer(reader=reader, writer=writer, binary=True, echo=True) server = AsyncioTelnetServer(reader=reader, writer=writer, binary=True, echo=True)
# warning: this will raise OSError exception if there is a problem...
self._wrapper_telnet_server = yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.console) self._wrapper_telnet_server = yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.console)
@asyncio.coroutine @asyncio.coroutine
@ -544,7 +545,7 @@ class BaseNode:
try: try:
yield from self._ubridge_hypervisor.send(command) yield from self._ubridge_hypervisor.send(command)
except UbridgeError as e: except UbridgeError as e:
raise UbridgeError("{}: {}".format(e, self._ubridge_hypervisor.read_stdout())) raise UbridgeError("Error while sending command '{}': {}: {}".format(command, e, self._ubridge_hypervisor.read_stdout()))
@locked_coroutine @locked_coroutine
def _start_ubridge(self): def _start_ubridge(self):

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

@ -421,7 +421,10 @@ class DockerVM(BaseNode):
stderr=asyncio.subprocess.STDOUT, stderr=asyncio.subprocess.STDOUT,
stdin=asyncio.subprocess.PIPE) stdin=asyncio.subprocess.PIPE)
server = AsyncioTelnetServer(reader=process.stdout, writer=process.stdin, binary=True, echo=True) server = AsyncioTelnetServer(reader=process.stdout, writer=process.stdin, binary=True, echo=True)
try:
self._telnet_servers.append((yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.aux))) self._telnet_servers.append((yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.aux)))
except OSError as e:
raise DockerError("Could not start Telnet server on socket {}:{}: {}".format(self._manager.port_manager.console_host, self.aux, e))
log.debug("Docker container '%s' started listen for auxilary telnet on %d", self.name, self.aux) log.debug("Docker container '%s' started listen for auxilary telnet on %d", self.name, self.aux)
@asyncio.coroutine @asyncio.coroutine
@ -518,7 +521,10 @@ class DockerVM(BaseNode):
input_stream = InputStream() input_stream = InputStream()
telnet = AsyncioTelnetServer(reader=output_stream, writer=input_stream, echo=True) telnet = AsyncioTelnetServer(reader=output_stream, writer=input_stream, echo=True)
try:
self._telnet_servers.append((yield from asyncio.start_server(telnet.run, self._manager.port_manager.console_host, self.console))) self._telnet_servers.append((yield from asyncio.start_server(telnet.run, self._manager.port_manager.console_host, self.console)))
except OSError as e:
raise DockerError("Could not start Telnet server on socket {}:{}: {}".format(self._manager.port_manager.console_host, self.console, e))
self._console_websocket = yield from self.manager.websocket_query("containers/{}/attach/ws?stream=1&stdin=1&stdout=1&stderr=1".format(self._cid)) self._console_websocket = yield from self.manager.websocket_query("containers/{}/attach/ws?stream=1&stdin=1&stdout=1&stderr=1".format(self._cid))
input_stream.ws = self._console_websocket input_stream.ws = self._console_websocket

4
gns3server/compute/dynamips/nodes/ethernet_switch.py
View File

@ -182,8 +182,10 @@ class EthernetSwitch(Device):
self._telnet_shell = EthernetSwitchConsole(self) self._telnet_shell = EthernetSwitchConsole(self)
self._telnet_shell.prompt = self._name + '> ' self._telnet_shell.prompt = self._name + '> '
self._telnet = create_telnet_shell(self._telnet_shell) self._telnet = create_telnet_shell(self._telnet_shell)
try:
self._telnet_server = (yield from asyncio.start_server(self._telnet.run, self._manager.port_manager.console_host, self.console)) self._telnet_server = (yield from asyncio.start_server(self._telnet.run, self._manager.port_manager.console_host, self.console))
except OSError as e:
self.project.emit("log.warning", {"message": "Could not start Telnet server on socket {}:{}: {}".format(self._manager.port_manager.console_host, self.console, e)})
self._hypervisor.devices.append(self) self._hypervisor.devices.append(self)
@asyncio.coroutine @asyncio.coroutine

6
gns3server/compute/dynamips/nodes/router.py
View File

@ -129,14 +129,16 @@ class Router(BaseNode):
try: try:
shutil.move(path, dst) shutil.move(path, dst)
except OSError as e: except OSError as e:
raise DynamipsError("Can't move {}: {}".format(path, str(e))) log.error("Can't move {}: {}".format(path, str(e)))
continue
for path in glob.glob(os.path.join(glob.escape(dynamips_dir), "*_i{}_*".format(dynamips_id))): for path in glob.glob(os.path.join(glob.escape(dynamips_dir), "*_i{}_*".format(dynamips_id))):
dst = os.path.join(self._working_directory, os.path.basename(path)) dst = os.path.join(self._working_directory, os.path.basename(path))
if not os.path.exists(dst): if not os.path.exists(dst):
try: try:
shutil.move(path, dst) shutil.move(path, dst)
except OSError as e: except OSError as e:
raise DynamipsError("Can't move {}: {}".format(path, str(e))) log.error("Can't move {}: {}".format(path, str(e)))
continue
def __json__(self): def __json__(self):

4
gns3server/compute/iou/iou_vm.py
View File

@ -543,7 +543,11 @@ class IOUVM(BaseNode):
if self.console and self.console_type == "telnet": if self.console and self.console_type == "telnet":
server = AsyncioTelnetServer(reader=self._iou_process.stdout, writer=self._iou_process.stdin, binary=True, echo=True) server = AsyncioTelnetServer(reader=self._iou_process.stdout, writer=self._iou_process.stdin, binary=True, echo=True)
try:
self._telnet_server = yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.console) self._telnet_server = yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.console)
except OSError as e:
yield from self.stop()
raise IOUError("Could not start Telnet server on socket {}:{}: {}".format(self._manager.port_manager.console_host, self.console, e))
# configure networking support # configure networking support
yield from self._networking() yield from self._networking()

3
gns3server/compute/qemu/qemu_vm.py
View File

@ -539,7 +539,7 @@ class QemuVM(BaseNode):
if not mac_address: if not mac_address:
# use the node UUID to generate a random MAC address # use the node UUID to generate a random MAC address
self._mac_address = "52:%s:%s:%s:%s:00" % (self.project.id[-4:-2], self.project.id[-2:], self.id[-4:-2], self.id[-2:]) self._mac_address = "0c:%s:%s:%s:%s:00" % (self.project.id[-4:-2], self.project.id[-2:], self.id[-4:-2], self.id[-2:])
else: else:
self._mac_address = mac_address self._mac_address = mac_address
@ -918,6 +918,7 @@ class QemuVM(BaseNode):
af, socktype, proto, _, sa = res af, socktype, proto, _, sa = res
# let the OS find an unused port for the Qemu monitor # let the OS find an unused port for the Qemu monitor
with socket.socket(af, socktype, proto) as sock: with socket.socket(af, socktype, proto) as sock:
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind(sa) sock.bind(sa)
self._monitor = sock.getsockname()[1] self._monitor = sock.getsockname()[1]
except OSError as e: except OSError as e:

33
gns3server/compute/traceng/traceng_vm.py
View File

@ -59,6 +59,7 @@ class TraceNGVM(BaseNode):
self._process = None self._process = None
self._started = False self._started = False
self._ip_address = None self._ip_address = None
self._default_destination = None
self._destination = None self._destination = None
self._local_udp_tunnel = None self._local_udp_tunnel = None
self._ethernet_adapter = EthernetAdapter() # one adapter with 1 Ethernet interface self._ethernet_adapter = EthernetAdapter() # one adapter with 1 Ethernet interface
@ -115,6 +116,7 @@ class TraceNGVM(BaseNode):
return {"name": self.name, return {"name": self.name,
"ip_address": self.ip_address, "ip_address": self.ip_address,
"default_destination": self._default_destination,
"node_id": self.id, "node_id": self.id,
"node_directory": self.working_path, "node_directory": self.working_path,
"status": self.status, "status": self.status,
@ -167,6 +169,30 @@ class TraceNGVM(BaseNode):
id=self.id, id=self.id,
ip_address=ip_address)) ip_address=ip_address))
@property
def default_destination(self):
"""
Returns the default destination IP/host for this node.
:returns: destination IP/host
"""
return self._default_destination
@default_destination.setter
def default_destination(self, destination):
"""
Sets the destination IP/host for this node.
:param destination: destination IP/host
"""
self._default_destination = destination
log.info("{module}: {name} [{id}] set default destination to {destination}".format(module=self.manager.module_name,
name=self.name,
id=self.id,
destination=destination))
@asyncio.coroutine @asyncio.coroutine
def start(self, destination=None): def start(self, destination=None):
""" """
@ -400,10 +426,15 @@ class TraceNGVM(BaseNode):
(to be passed to subprocess.Popen()) (to be passed to subprocess.Popen())
""" """
if not destination:
# use the default destination if no specific destination provided
destination = self.default_destination
if not destination: if not destination:
raise TraceNGError("Please provide a host or IP address to trace") raise TraceNGError("Please provide a host or IP address to trace")
if not self._ip_address: if not self.ip_address:
raise TraceNGError("Please configure an IP address for this TraceNG node") raise TraceNGError("Please configure an IP address for this TraceNG node")
if self.ip_address == destination:
raise TraceNGError("Destination cannot be the same as the IP address")
self._destination = destination self._destination = destination
command = [self._traceng_path()] command = [self._traceng_path()]

3
gns3server/compute/virtualbox/virtualbox_vm.py
View File

@ -953,7 +953,10 @@ class VirtualBoxVM(BaseNode):
writer=self._remote_pipe, writer=self._remote_pipe,
binary=True, binary=True,
echo=True) echo=True)
try:
self._telnet_server = yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.console) self._telnet_server = yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.console)
except OSError as e:
self.project.emit("log.warning", {"message": "Could not start Telnet server on socket {}:{}: {}".format(self._manager.port_manager.console_host, self.console, e)})
@asyncio.coroutine @asyncio.coroutine
def _stop_remote_console(self): def _stop_remote_console(self):

8
gns3server/compute/vmware/__init__.py
View File

@ -254,7 +254,7 @@ class VMware(BaseManager):
if winreg.QueryInfoKey(hkeyvmnet)[1]: if winreg.QueryInfoKey(hkeyvmnet)[1]:
# the vmnet has not been configure if the key has no values # the vmnet has not been configure if the key has no values
vmnet = vmnet.replace("vm", "VM") vmnet = vmnet.replace("vm", "VM")
if vmnet not in ("VMnet1", "VMnet8"): if vmnet not in ("VMnet0", "VMnet1", "VMnet8"):
vmnet_interfaces.append(vmnet) vmnet_interfaces.append(vmnet)
winreg.CloseKey(hkeyvmnet) winreg.CloseKey(hkeyvmnet)
winreg.CloseKey(hkey) winreg.CloseKey(hkey)
@ -279,7 +279,7 @@ class VMware(BaseManager):
match = re.search("VNET_([0-9]+)_VIRTUAL_ADAPTER", line) match = re.search("VNET_([0-9]+)_VIRTUAL_ADAPTER", line)
if match: if match:
vmnet = "vmnet{}".format(match.group(1)) vmnet = "vmnet{}".format(match.group(1))
if vmnet not in ("vmnet1", "vmnet8"): if vmnet not in ("vmnet0", "vmnet1", "vmnet8"):
vmnet_interfaces.append(vmnet) vmnet_interfaces.append(vmnet)
except OSError as e: except OSError as e:
raise VMwareError("Cannot open {}: {}".format(vmware_networking_file, e)) raise VMwareError("Cannot open {}: {}".format(vmware_networking_file, e))
@ -298,11 +298,11 @@ class VMware(BaseManager):
match = re.search("(VMnet[0-9]+)", windows_name) match = re.search("(VMnet[0-9]+)", windows_name)
if match: if match:
vmnet = match.group(1) vmnet = match.group(1)
if vmnet not in ("VMnet1", "VMnet8"): if vmnet not in ("VMnet0", "VMnet1", "VMnet8"):
vmnet_interfaces.append(vmnet) vmnet_interfaces.append(vmnet)
elif interface["name"].startswith("vmnet"): elif interface["name"].startswith("vmnet"):
vmnet = interface["name"] vmnet = interface["name"]
if vmnet not in ("vmnet1", "vmnet8"): if vmnet not in ("vmnet0", "vmnet1", "vmnet8"):
vmnet_interfaces.append(interface["name"]) vmnet_interfaces.append(interface["name"])
return vmnet_interfaces return vmnet_interfaces

28
gns3server/compute/vmware/vmware_vm.py
View File

@ -279,6 +279,7 @@ class VMwareVM(BaseNode):
continue continue
self._vmx_pairs["ethernet{}.connectiontype".format(adapter_number)] = "custom" self._vmx_pairs["ethernet{}.connectiontype".format(adapter_number)] = "custom"
# make sure we have a vmnet per adapter if we use uBridge # make sure we have a vmnet per adapter if we use uBridge
allocate_vmnet = False allocate_vmnet = False
@ -287,7 +288,7 @@ class VMwareVM(BaseNode):
if vnet in self._vmx_pairs: if vnet in self._vmx_pairs:
vmnet = os.path.basename(self._vmx_pairs[vnet]) vmnet = os.path.basename(self._vmx_pairs[vnet])
if self.manager.is_managed_vmnet(vmnet) or vmnet in ("vmnet0", "vmnet1", "vmnet8"): if self.manager.is_managed_vmnet(vmnet) or vmnet in ("vmnet0", "vmnet1", "vmnet8"):
# vmnet already managed, try to allocate a new one # vmnet already managed or a special vmnet, try to allocate a new one
allocate_vmnet = True allocate_vmnet = True
else: else:
# otherwise allocate a new one # otherwise allocate a new one
@ -301,7 +302,7 @@ class VMwareVM(BaseNode):
self._vmnets.clear() self._vmnets.clear()
raise raise
# mark the vmnet managed by us # mark the vmnet as managed by us
if vmnet not in self._vmnets: if vmnet not in self._vmnets:
self._vmnets.append(vmnet) self._vmnets.append(vmnet)
self._vmx_pairs["ethernet{}.vnet".format(adapter_number)] = vmnet self._vmx_pairs["ethernet{}.vnet".format(adapter_number)] = vmnet
@ -740,17 +741,18 @@ class VMwareVM(BaseNode):
if self._get_vmx_setting("ethernet{}.present".format(adapter_number), "TRUE"): if self._get_vmx_setting("ethernet{}.present".format(adapter_number), "TRUE"):
# check for the connection type # check for the connection type
connection_type = "ethernet{}.connectiontype".format(adapter_number) connection_type = "ethernet{}.connectiontype".format(adapter_number)
if connection_type in self._vmx_pairs and self._vmx_pairs[connection_type] in ("nat", "bridged", "hostonly"): if not self._use_any_adapter and connection_type in self._vmx_pairs and self._vmx_pairs[connection_type] in ("nat", "bridged", "hostonly"):
if not self._use_any_adapter: if (yield from self.is_running()):
raise VMwareError("Attachment '{attachment}' is already configured on network adapter {adapter_number}. "
"Please remove it or allow VMware VM '{name}' to use any adapter.".format(attachment=self._vmx_pairs[connection_type],
adapter_number=adapter_number,
name=self.name))
elif (yield from self.is_running()):
raise VMwareError("Attachment '{attachment}' is configured on network adapter {adapter_number}. " raise VMwareError("Attachment '{attachment}' is configured on network adapter {adapter_number}. "
"Please stop VMware VM '{name}' to link to this adapter and allow GNS3 to change the attachment type.".format(attachment=self._vmx_pairs[connection_type], "Please stop VMware VM '{name}' to link to this adapter and allow GNS3 to change the attachment type.".format(attachment=self._vmx_pairs[connection_type],
adapter_number=adapter_number, adapter_number=adapter_number,
name=self.name)) name=self.name))
else:
raise VMwareError("Attachment '{attachment}' is already configured on network adapter {adapter_number}. "
"Please remove it or allow VMware VM '{name}' to use any adapter.".format(attachment=self._vmx_pairs[connection_type],
adapter_number=adapter_number,
name=self.name))
adapter.add_nio(0, nio) adapter.add_nio(0, nio)
if self._started and self._ubridge_hypervisor: if self._started and self._ubridge_hypervisor:
@ -847,8 +849,14 @@ class VMwareVM(BaseNode):
if self.console and self.console_type == "telnet": if self.console and self.console_type == "telnet":
self._remote_pipe = yield from asyncio_open_serial(self._get_pipe_name()) self._remote_pipe = yield from asyncio_open_serial(self._get_pipe_name())
server = AsyncioTelnetServer(reader=self._remote_pipe, writer=self._remote_pipe, binary=True, echo=True) server = AsyncioTelnetServer(reader=self._remote_pipe,
writer=self._remote_pipe,
binary=True,
echo=True)
try:
self._telnet_server = yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.console) self._telnet_server = yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.console)
except OSError as e:
self.project.emit("log.warning", {"message": "Could not start Telnet server on socket {}:{}: {}".format(self._manager.port_manager.console_host, self.console, e)})
@asyncio.coroutine @asyncio.coroutine
def _stop_remote_console(self): def _stop_remote_console(self):

1
gns3server/controller/gns3vm/virtualbox_gns3_vm.py
View File

@ -191,6 +191,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
try: try:
# get a random port on localhost # get a random port on localhost
with socket.socket() as s: with socket.socket() as s:
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind((ip_address, 0)) s.bind((ip_address, 0))
api_port = s.getsockname()[1] api_port = s.getsockname()[1]
except OSError as e: except OSError as e:

25
gns3server/controller/project.py
View File

@ -68,7 +68,7 @@ class Project:
def __init__(self, name=None, project_id=None, path=None, controller=None, status="opened", def __init__(self, name=None, project_id=None, path=None, controller=None, status="opened",
filename=None, auto_start=False, auto_open=False, auto_close=True, filename=None, auto_start=False, auto_open=False, auto_close=True,
scene_height=1000, scene_width=2000, zoom=100, show_layers=False, snap_to_grid=False, show_grid=False, scene_height=1000, scene_width=2000, zoom=100, show_layers=False, snap_to_grid=False, show_grid=False,
show_interface_labels=False): grid_size=0, show_interface_labels=False):
self._controller = controller self._controller = controller
assert name is not None assert name is not None
@ -83,6 +83,7 @@ class Project:
self._show_layers = show_layers self._show_layers = show_layers
self._snap_to_grid = snap_to_grid self._snap_to_grid = snap_to_grid
self._show_grid = show_grid self._show_grid = show_grid
self._grid_size = grid_size
self._show_interface_labels = show_interface_labels self._show_interface_labels = show_interface_labels
self._loading = False self._loading = False
@ -236,6 +237,21 @@ class Project:
""" """
self._show_grid = show_grid self._show_grid = show_grid
@property
def grid_size(self):
"""
Grid size
:return: integer
"""
return self._grid_size
@grid_size.setter
def grid_size(self, grid_size):
"""
Setter for grid size
"""
self._grid_size = grid_size
@property @property
def show_interface_labels(self): def show_interface_labels(self):
""" """
@ -794,6 +810,7 @@ class Project:
"show_layers", "show_layers",
"snap_to_grid", "snap_to_grid",
"show_grid", "show_grid",
"grid_size",
"show_interface_labels" "show_interface_labels"
] ]
@ -939,12 +956,7 @@ class Project:
Start all nodes Start all nodes
""" """
pool = Pool(concurrency=3) pool = Pool(concurrency=3)
emit_warning = True
for node in self.nodes.values(): for node in self.nodes.values():
if node.node_type == "traceng" and emit_warning:
self.controller.notification.emit("log.warning", {"message": "TraceNG nodes must be started one by one"})
emit_warning = False
continue
pool.append(node.start) pool.append(node.start)
yield from pool.join() yield from pool.join()
@ -1043,6 +1055,7 @@ class Project:
"show_layers": self._show_layers, "show_layers": self._show_layers,
"snap_to_grid": self._snap_to_grid, "snap_to_grid": self._snap_to_grid,
"show_grid": self._show_grid, "show_grid": self._show_grid,
"grid_size": self._grid_size,
"show_interface_labels": self._show_interface_labels "show_interface_labels": self._show_interface_labels
} }

1
gns3server/controller/topology.py
View File

@ -83,6 +83,7 @@ def project_to_topology(project):
"show_layers": project.show_layers, "show_layers": project.show_layers,
"snap_to_grid": project.snap_to_grid, "snap_to_grid": project.snap_to_grid,
"show_grid": project.show_grid, "show_grid": project.show_grid,
"grid_size": project.grid_size,
"show_interface_labels": project.show_interface_labels, "show_interface_labels": project.show_interface_labels,
"topology": { "topology": {
"nodes": [], "nodes": [],

6
gns3server/handlers/api/compute/traceng_handler.py
View File

@ -55,7 +55,8 @@ class TraceNGHandler:
request.match_info["project_id"], request.match_info["project_id"],
request.json.get("node_id"), request.json.get("node_id"),
console=request.json.get("console")) console=request.json.get("console"))
vm.ip_address = request.json.get("ip_address", "") # FIXME, required IP address to create node? vm.ip_address = request.json.get("ip_address", "")
vm.default_destination = request.json.get("default_destination", "")
response.set_status(201) response.set_status(201)
response.json(vm) response.json(vm)
@ -99,6 +100,7 @@ class TraceNGHandler:
vm = traceng_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"]) vm = traceng_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
vm.name = request.json.get("name", vm.name) vm.name = request.json.get("name", vm.name)
vm.ip_address = request.json.get("ip_address", vm.ip_address) vm.ip_address = request.json.get("ip_address", vm.ip_address)
vm.default_destination = request.json.get("default_destination", vm.default_destination)
vm.updated() vm.updated()
response.json(vm) response.json(vm)
@ -157,7 +159,7 @@ class TraceNGHandler:
traceng_manager = TraceNG.instance() traceng_manager = TraceNG.instance()
vm = traceng_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"]) vm = traceng_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
yield from vm.start(request.json["destination"]) yield from vm.start(request.get("destination"))
response.json(vm) response.json(vm)
@Route.post( @Route.post(

12
gns3server/schemas/project.py
View File

@ -66,6 +66,10 @@ PROJECT_CREATE_SCHEMA = {
"type": "boolean", "type": "boolean",
"description": "Show the grid on the drawing area" "description": "Show the grid on the drawing area"
}, },
"grid_size": {
"type": "integer",
"description": "Grid size for the drawing area"
},
"show_interface_labels": { "show_interface_labels": {
"type": "boolean", "type": "boolean",
"description": "Show interface labels on the drawing area" "description": "Show interface labels on the drawing area"
@ -125,6 +129,10 @@ PROJECT_UPDATE_SCHEMA = {
"type": "boolean", "type": "boolean",
"description": "Show the grid on the drawing area" "description": "Show the grid on the drawing area"
}, },
"grid_size": {
"type": "integer",
"description": "Grid size for the drawing area"
},
"show_interface_labels": { "show_interface_labels": {
"type": "boolean", "type": "boolean",
"description": "Show interface labels on the drawing area" "description": "Show interface labels on the drawing area"
@ -200,6 +208,10 @@ PROJECT_OBJECT_SCHEMA = {
"type": "boolean", "type": "boolean",
"description": "Show the grid on the drawing area" "description": "Show the grid on the drawing area"
}, },
"grid_size": {
"type": "integer",
"description": "Grid size for the drawing area"
},
"show_interface_labels": { "show_interface_labels": {
"type": "boolean", "type": "boolean",
"description": "Show interface labels on the drawing area" "description": "Show interface labels on the drawing area"

4
gns3server/schemas/topology.py
View File

@ -89,6 +89,10 @@ TOPOLOGY_SCHEMA = {
"type": "boolean", "type": "boolean",
"description": "Show the grid on the drawing area" "description": "Show the grid on the drawing area"
}, },
"grid_size": {
"type": "integer",
"description": "Grid size for the drawing area"
},
"show_interface_labels": { "show_interface_labels": {
"type": "boolean", "type": "boolean",
"description": "Show interface labels on the drawing area" "description": "Show interface labels on the drawing area"

15
gns3server/schemas/traceng.py
View File

@ -48,6 +48,10 @@ TRACENG_CREATE_SCHEMA = {
"ip_address": { "ip_address": {
"description": "Source IP address for tracing", "description": "Source IP address for tracing",
"type": ["string"] "type": ["string"]
},
"default_destination": {
"description": "Default destination IP address or hostname for tracing",
"type": ["string"]
} }
}, },
"additionalProperties": False, "additionalProperties": False,
@ -77,6 +81,10 @@ TRACENG_UPDATE_SCHEMA = {
"ip_address": { "ip_address": {
"description": "Source IP address for tracing", "description": "Source IP address for tracing",
"type": ["string"] "type": ["string"]
},
"default_destination": {
"description": "Default destination IP address or hostname for tracing",
"type": ["string"]
} }
}, },
"additionalProperties": False, "additionalProperties": False,
@ -92,7 +100,6 @@ TRACENG_START_SCHEMA = {
"type": ["string"] "type": ["string"]
} }
}, },
"required": ["destination"],
} }
TRACENG_OBJECT_SCHEMA = { TRACENG_OBJECT_SCHEMA = {
@ -144,8 +151,12 @@ TRACENG_OBJECT_SCHEMA = {
"ip_address": { "ip_address": {
"description": "Source IP address for tracing", "description": "Source IP address for tracing",
"type": ["string"] "type": ["string"]
},
"default_destination": {
"description": "Default destination IP address or hostname for tracing",
"type": ["string"]
} }
}, },
"additionalProperties": False, "additionalProperties": False,
"required": ["name", "node_id", "status", "console", "console_type", "project_id", "command_line", "ip_address"] "required": ["name", "node_id", "status", "console", "console_type", "project_id", "command_line", "ip_address", "default_destination"]
} }

1
gns3server/ubridge/hypervisor.py
View File

@ -62,6 +62,7 @@ class Hypervisor(UBridgeHypervisor):
af, socktype, proto, _, sa = res af, socktype, proto, _, sa = res
# let the OS find an unused port for the uBridge hypervisor # let the OS find an unused port for the uBridge hypervisor
with socket.socket(af, socktype, proto) as sock: with socket.socket(af, socktype, proto) as sock:
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind(sa) sock.bind(sa)
port = sock.getsockname()[1] port = sock.getsockname()[1]
break break

3
tests/controller/test_project.py
View File

@ -75,7 +75,8 @@ def test_json(tmpdir):
"show_grid": False, "show_grid": False,
"show_interface_labels": False, "show_interface_labels": False,
"show_layers": False, "show_layers": False,
"snap_to_grid": False "snap_to_grid": False,
"grid_size": 0,
} }

1
tests/controller/test_topology.py
View File

@ -45,6 +45,7 @@ def test_project_to_topology_empty(tmpdir):
"show_interface_labels": False, "show_interface_labels": False,
"show_layers": False, "show_layers": False,
"snap_to_grid": False, "snap_to_grid": False,
"grid_size": 0,
"topology": { "topology": {
"nodes": [], "nodes": [],
"links": [], "links": [],