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

Deactivate the embedded shell for Ethernet switch. Ref #1424 #1556

Browse Source
This commit is contained in:
grossmj 2019-03-20 16:23:30 +08:00
parent dd211bce52
commit 1f1d93d078
4 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ http://github.com/GNS3/dynamips/blob/master/README.hypervisor#L558
import asyncio import asyncio
from gns3server.utils import parse_version from gns3server.utils import parse_version
from gns3server.utils.asyncio.embed_shell import EmbedShell, create_telnet_shell #from gns3server.utils.asyncio.embed_shell import EmbedShell, create_telnet_shell
from .device import Device from .device import Device
@ -34,36 +34,36 @@ import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class EthernetSwitchConsole(EmbedShell): # class EthernetSwitchConsole(EmbedShell):
""" # """
Console for the ethernet switch # Console for the ethernet switch
""" # """
#
def __init__(self, node): # def __init__(self, node):
super().__init__(welcome_message="Welcome to GNS3 builtin Ethernet switch.\n\nType help for available commands\n") # super().__init__(welcome_message="Welcome to GNS3 builtin Ethernet switch.\n\nType help for available commands\n")
self._node = node # self._node = node
#
async def mac(self): # async def mac(self):
""" # """
Show MAC address table # Show MAC address table
""" # """
res = 'Port Mac VLAN\n' # res = 'Port Mac VLAN\n'
result = (await self._node._hypervisor.send('ethsw show_mac_addr_table {}'.format(self._node.name))) # result = (await self._node._hypervisor.send('ethsw show_mac_addr_table {}'.format(self._node.name)))
for line in result: # for line in result:
mac, vlan, nio = line.replace(' ', ' ').split(' ') # mac, vlan, nio = line.replace(' ', ' ').split(' ')
mac = mac.replace('.', '') # mac = mac.replace('.', '')
mac = "{}:{}:{}:{}:{}:{}".format( # mac = "{}:{}:{}:{}:{}:{}".format(
mac[0:2], # mac[0:2],
mac[2:4], # mac[2:4],
mac[4:6], # mac[4:6],
mac[6:8], # mac[6:8],
mac[8:10], # mac[8:10],
mac[10:12]) # mac[10:12])
for port_number, switch_nio in self._node.nios.items(): # for port_number, switch_nio in self._node.nios.items():
if switch_nio.name == nio: # if switch_nio.name == nio:
res += 'Ethernet' + str(port_number) + ' ' + mac + ' ' + vlan + '\n' # res += 'Ethernet' + str(port_number) + ' ' + mac + ' ' + vlan + '\n'
break # break
return res # return res
class EthernetSwitch(Device): class EthernetSwitch(Device):
@ -85,8 +85,8 @@ class EthernetSwitch(Device):
self._nios = {} self._nios = {}
self._mappings = {} self._mappings = {}
self._telnet_console = None self._telnet_console = None
self._telnet_shell = None #self._telnet_shell = None
self._telnet_server = None #self._telnet_server = None
self._console = console self._console = console
self._console_type = console_type self._console_type = console_type
@ -177,13 +177,13 @@ class EthernetSwitch(Device):
await self._hypervisor.send('ethsw create "{}"'.format(self._name)) await self._hypervisor.send('ethsw create "{}"'.format(self._name))
log.info('Ethernet switch "{name}" [{id}] has been created'.format(name=self._name, id=self._id)) log.info('Ethernet switch "{name}" [{id}] has been created'.format(name=self._name, id=self._id))
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: #try:
self._telnet_server = (await asyncio.start_server(self._telnet.run, self._manager.port_manager.console_host, self.console)) # self._telnet_server = (await asyncio.start_server(self._telnet.run, self._manager.port_manager.console_host, self.console))
except OSError as e: #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.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)
async def set_name(self, new_name): async def set_name(self, new_name):
@ -227,9 +227,9 @@ class EthernetSwitch(Device):
Deletes this Ethernet switch. Deletes this Ethernet switch.
""" """
await self._telnet.close() #await self._telnet.close()
if self._telnet_server: #if self._telnet_server:
self._telnet_server.close() # self._telnet_server.close()
for nio in self._nios.values(): for nio in self._nios.values():
if nio: if nio:

6
gns3server/utils/asyncio/embed_shell.py
View File

@ -32,8 +32,8 @@ from prompt_toolkit.shortcuts import create_prompt_application, create_asyncio_e
from prompt_toolkit.terminal.vt100_output import Vt100_Output from prompt_toolkit.terminal.vt100_output import Vt100_Output
from prompt_toolkit.input import StdinInput from prompt_toolkit.input import StdinInput
from .telnet_server import AsyncioTelnetServer, TelnetConnection from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer, TelnetConnection
from .input_stream import InputStream from gns3server.utils.asyncio.input_stream import InputStream
class EmbedShell: class EmbedShell:
@ -344,7 +344,7 @@ if __name__ == '__main__':
else: else:
return 'world\n' return 'world\n'
return (await world()) return await world()
# Demo using telnet # Demo using telnet
shell = Demo(welcome_message="Welcome!\n") shell = Demo(welcome_message="Welcome!\n")

3
gns3server/web/web_server.py
View File

@ -181,6 +181,9 @@ class WebServer:
return ssl_context return ssl_context
async def start_shell(self): async def start_shell(self):
log.error("The embedded shell has been deactivated in this version of GNS3")
return
try: try:
from ptpython.repl import embed from ptpython.repl import embed
except ImportError: except ImportError:

1
requirements.txt
View File

@ -6,6 +6,5 @@ async_generator>=1.10
Jinja2>=2.7.3 Jinja2>=2.7.3
raven>=5.23.0 raven>=5.23.0
psutil>=3.0.0 psutil>=3.0.0
prompt-toolkit==1.0.15
async-timeout==3.0.1 async-timeout==3.0.1
distro>=1.3.0 distro>=1.3.0