From 8a0aa99c7df83cff6c9763804f1d4cd10b43a45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E5=B9=BF=E6=8C=AF?= Date: Fri, 27 Nov 2020 17:20:23 +0800 Subject: [PATCH 1/2] ruijie support --- netdev/dispatcher.py | 2 ++ netdev/vendors/__init__.py | 2 ++ netdev/vendors/ruijie/__init__.py | 4 ++++ netdev/vendors/ruijie/ruijie_os.py | 11 +++++++++++ 4 files changed, 19 insertions(+) create mode 100644 netdev/vendors/ruijie/__init__.py create mode 100644 netdev/vendors/ruijie/ruijie_os.py diff --git a/netdev/dispatcher.py b/netdev/dispatcher.py index 5f54483..335a6d1 100644 --- a/netdev/dispatcher.py +++ b/netdev/dispatcher.py @@ -13,6 +13,7 @@ from netdev.vendors import UbiquityEdgeSwitch from netdev.vendors import HW1000 from netdev.vendors import Huawei +from netdev.vendors import RuijieOS # @formatter:off # The keys of this dictionary are the supported device_types @@ -36,6 +37,7 @@ "terminal": Terminal, "hw1000": HW1000, "huawei": Huawei, + "ruijie_os": RuijieOS, } # @formatter:on diff --git a/netdev/vendors/__init__.py b/netdev/vendors/__init__.py index e1664f2..0d86abe 100644 --- a/netdev/vendors/__init__.py +++ b/netdev/vendors/__init__.py @@ -14,6 +14,7 @@ from netdev.vendors.ubiquiti import UbiquityEdgeSwitch from netdev.vendors.infotecs import HW1000 from netdev.vendors.huawei import Huawei +from netdev.vendors.ruijie import RuijieOS __all__ = ( "CiscoASA", @@ -45,4 +46,5 @@ "HW1000", "AlcatelAOS", "Huawei", + "RuijieOS", ) diff --git a/netdev/vendors/ruijie/__init__.py b/netdev/vendors/ruijie/__init__.py new file mode 100644 index 0000000..9d40b1f --- /dev/null +++ b/netdev/vendors/ruijie/__init__.py @@ -0,0 +1,4 @@ +from .ruijie_os import RuijieOS + +__all__ = ["RuijieIOS", ] + diff --git a/netdev/vendors/ruijie/ruijie_os.py b/netdev/vendors/ruijie/ruijie_os.py new file mode 100644 index 0000000..d2262dd --- /dev/null +++ b/netdev/vendors/ruijie/ruijie_os.py @@ -0,0 +1,11 @@ +"""Ruijie RGOS Support""" +from netdev.vendors.ios_like import IOSLikeDevice + + +class RuijieOSBase(IOSLikeDevice): + pass + + +class RuijieOS(RuijieOSBase): + pass + From 6880e649b514848337ee3942d82a23a2503acbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E5=B9=BF=E6=8C=AF?= Date: Sun, 29 Nov 2020 19:26:21 +0800 Subject: [PATCH 2/2] fix _delimiter_left_list for huawei CE6851 ... support --- netdev/vendors/comware_like.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netdev/vendors/comware_like.py b/netdev/vendors/comware_like.py index bc83c2b..b28254f 100644 --- a/netdev/vendors/comware_like.py +++ b/netdev/vendors/comware_like.py @@ -23,7 +23,7 @@ class ComwareLikeDevice(BaseDevice): _delimiter_list = [">", "]"] """All this characters will stop reading from buffer. It mean the end of device prompt""" - _delimiter_left_list = ["<", "["] + _delimiter_left_list = ["<", "[", "*", "~"] """Begging prompt characters. Prompt must contain it""" _pattern = r"[{delimiter_left}]{prompt}[\-\w]*[{delimiter_right}]"