allow parallel telnet and netconf connections

telekom · Nov 1, 2023 · ab6617a · ab6617a
1 parent e96194b
commit ab6617a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/mb_netmgmt/__init__.py b/mb_netmgmt/__init__.py
@@ -18,7 +18,7 @@
 # along with mb-netmgmt. If not, see <https://www.gnu.org/licenses/
 
 """Network Management Protocols for Mountebank"""
-__version__ = "0.0.73"
+__version__ = "0.0.74"
 
 import os
 import subprocess

diff --git a/mb_netmgmt/netconf.py b/mb_netmgmt/netconf.py
@@ -19,7 +19,7 @@
 
 import logging
 from socketserver import BaseRequestHandler
-from socketserver import TCPServer as Server
+from socketserver import ThreadingTCPServer as Server
 
 from lxml import etree
 from ncclient.devices.default import DefaultDeviceHandler

diff --git a/mb_netmgmt/telnet.py b/mb_netmgmt/telnet.py
@@ -20,12 +20,11 @@
 import re
 import telnetlib
 import time
-from socketserver import StreamRequestHandler, TCPServer
+from socketserver import StreamRequestHandler
+from socketserver import ThreadingTCPServer as Server
 
 from mb_netmgmt.__main__ import Protocol, get_cli_patterns
 
-Server = TCPServer
-
 
 class Handler(StreamRequestHandler, Protocol):
     def handle(self):

diff --git a/test/test_mb_netmgmt.py b/test/test_mb_netmgmt.py
@@ -190,7 +190,7 @@ def test_netconf_default_response():
 def test_netconf_private_key():
     with mb(
         [
-            {"protocol": "netconf", "port": 830, "stubs": []},
+            {"protocol": "netconf", "port": 8832, "stubs": []},
             {
                 "protocol": "netconf",
                 "port": port,
@@ -199,7 +199,7 @@ def test_netconf_private_key():
                         "responses": [
                             {
                                 "proxy": {
-                                    "to": f"netconf://{os.environ['NETCONF_USERNAME']}@localhost",
+                                    "to": f"netconf://{os.environ['NETCONF_USERNAME']}@localhost:8832",
                                     "key": os.environ["NETCONF_KEY"],
                                 }
                             },