NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-30 21:03:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qemu VM support to detect when a link is plugged/unplugged.

Browse Source
This commit is contained in:
grossmj 2018-03-19 14:22:10 +07:00
parent b7e436efdf
commit c7875f93a3
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -935,15 +935,6 @@ class QemuVM(BaseNode):
stdout=fd, stdout=fd,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
cwd=self.working_dir) cwd=self.working_dir)
yield from self._start_ubridge()
for adapter_number, adapter in enumerate(self._ethernet_adapters):
nio = adapter.get_nio(0)
if nio:
yield from self.add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
self._local_udp_tunnels[adapter_number][1],
nio)
log.info('QEMU VM "{}" started PID={}'.format(self._name, self._process.pid)) log.info('QEMU VM "{}" started PID={}'.format(self._name, self._process.pid))
self.status = "started" self.status = "started"
monitor_process(self._process, self._termination_callback) monitor_process(self._process, self._termination_callback)
@ -958,6 +949,17 @@ class QemuVM(BaseNode):
if "-enable-kvm" in command_string: if "-enable-kvm" in command_string:
self._hw_virtualization = True self._hw_virtualization = True
yield from self._start_ubridge()
for adapter_number, adapter in enumerate(self._ethernet_adapters):
nio = adapter.get_nio(0)
if nio:
yield from self.add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
self._local_udp_tunnels[adapter_number][1],
nio)
else:
yield from self._control_vm("set_link gns3-{} off".format(adapter_number))
try: try:
yield from self.start_wrap_console() yield from self.start_wrap_console()
except OSError as e: except OSError as e:
@ -1026,10 +1028,10 @@ class QemuVM(BaseNode):
if self.is_running() and self._monitor: if self.is_running() and self._monitor:
log.debug("Execute QEMU monitor command: {}".format(command)) log.debug("Execute QEMU monitor command: {}".format(command))
try: try:
log.info("Connecting to Qemu monitor on {}:{}".format(self._monitor_host, self._monitor)) log.debug("Connecting to Qemu monitor on {}:{}".format(self._monitor_host, self._monitor))
reader, writer = yield from asyncio.open_connection(self._monitor_host, self._monitor) reader, writer = yield from asyncio.open_connection(self._monitor_host, self._monitor)
except OSError as e: except OSError as e:
log.warning("Could not connect to QEMU monitor: {}".format(e)) log.warning("Could not connect to QEMU monitor on {}: {}".format(self._monitor_host, self._monitor, e))
return result return result
try: try:
writer.write(command.encode('ascii') + b"\n") writer.write(command.encode('ascii') + b"\n")
@ -1164,6 +1166,7 @@ class QemuVM(BaseNode):
yield from self.add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number), yield from self.add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
self._local_udp_tunnels[adapter_number][1], self._local_udp_tunnels[adapter_number][1],
nio) nio)
yield from self._control_vm("set_link gns3-{} on".format(adapter_number))
except (IndexError, KeyError): except (IndexError, KeyError):
raise QemuError('Adapter {adapter_number} does not exist on QEMU VM "{name}"'.format(name=self._name, raise QemuError('Adapter {adapter_number} does not exist on QEMU VM "{name}"'.format(name=self._name,
adapter_number=adapter_number)) adapter_number=adapter_number))
@ -1185,8 +1188,7 @@ class QemuVM(BaseNode):
if self.is_running(): if self.is_running():
try: try:
yield from self.update_ubridge_udp_connection( yield from self.update_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
"QEMU-{}-{}".format(self._id, adapter_number),
self._local_udp_tunnels[adapter_number][1], self._local_udp_tunnels[adapter_number][1],
nio) nio)
except IndexError: except IndexError:
@ -1210,6 +1212,7 @@ class QemuVM(BaseNode):
adapter_number=adapter_number)) adapter_number=adapter_number))
if self.is_running(): if self.is_running():
yield from self._control_vm("set_link gns3-{} off".format(adapter_number))
yield from self._ubridge_send("bridge delete {name}".format(name="QEMU-{}-{}".format(self._id, adapter_number))) yield from self._ubridge_send("bridge delete {name}".format(name="QEMU-{}-{}".format(self._id, adapter_number)))
nio = adapter.get_nio(0) nio = adapter.get_nio(0)
@ -1592,8 +1595,6 @@ class QemuVM(BaseNode):
nio.rport, nio.rport,
"127.0.0.1", "127.0.0.1",
nio.lport)]) nio.lport)])
elif isinstance(nio, NIOTAP):
network_options.extend(["-net", "tap,name=gns3-{},ifname={}".format(adapter_number, nio.tap_device)])
else: else:
network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_number, mac, self._adapter_type)]) network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_number, mac, self._adapter_type)])
@ -1613,8 +1614,6 @@ class QemuVM(BaseNode):
nio.rport, nio.rport,
"127.0.0.1", "127.0.0.1",
nio.lport)]) nio.lport)])
elif isinstance(nio, NIOTAP):
network_options.extend(["-netdev", "tap,id=gns3-{},ifname={},script=no,downscript=no".format(adapter_number, nio.tap_device)])
else: else:
network_options.extend(["-device", device_string]) network_options.extend(["-device", device_string])