Remove Scrapli

thatmattlove · Oct 6, 2021 · 60786d1 · 60786d1
1 parent fe7abdd
commit 60786d1
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 157 deletions.
diff --git a/hyperglass/constants.py b/hyperglass/constants.py
@@ -76,17 +76,6 @@
 }
 
 DRIVER_MAP = {
-    # TODO: Troubleshoot Arista with Scrapli, broken after upgrading to 2021.1.30.
-    # "arista_eos": "scrapli", # noqa: E800
-    "bird": "scrapli",
-    "cisco_ios": "scrapli",
-    "cisco_xe": "scrapli",
-    "cisco_xr": "scrapli",
-    "cisco_nxos": "scrapli",
-    # TODO: Troubleshoot Juniper with Scrapli, broken after upgrading to 2021.7.30.
-    # "juniper": "scrapli", # noqa: E800
-    "tnsr": "scrapli",
-    "frr": "scrapli",
     "frr_legacy": "hyperglass_agent",
     "bird_legacy": "hyperglass_agent",
 }
diff --git a/hyperglass/execution/drivers/__init__.py b/hyperglass/execution/drivers/__init__.py
@@ -4,11 +4,9 @@
 from .agent import AgentConnection
 from ._common import Connection
 from .ssh_netmiko import NetmikoConnection
-from .ssh_scrapli import ScrapliConnection
 
 __all__ = (
     "AgentConnection",
     "Connection",
     "NetmikoConnection",
-    "ScrapliConnection",
 )
diff --git a/hyperglass/execution/drivers/ssh_scrapli.py b/hyperglass/execution/drivers/ssh_scrapli.py
diff --git a/hyperglass/execution/main.py b/hyperglass/execution/main.py
@@ -22,16 +22,13 @@
     from hyperglass.models.data import OutputDataModel
 
 # Local
-from .drivers import AgentConnection, NetmikoConnection, ScrapliConnection
+from .drivers import AgentConnection, NetmikoConnection
 
 
 def map_driver(driver_name: str) -> "Connection":
     """Get the correct driver class based on the driver name."""
 
-    if driver_name == "scrapli":
-        return ScrapliConnection
-
-    elif driver_name == "hyperglass_agent":
+    if driver_name == "hyperglass_agent":
         return AgentConnection
 
     return NetmikoConnection

diff --git a/hyperglass/log.py b/hyperglass/log.py
@@ -118,7 +118,6 @@ def setup_lib_logging(log_level: str) -> None:
         "uvicorn.asgi",
         "netmiko",
         "paramiko",
-        "scrapli",
         "httpx",
     ]:
         if name not in seen:

diff --git a/hyperglass/models/fields.py b/hyperglass/models/fields.py
@@ -9,7 +9,7 @@
 
 IntFloat = t.TypeVar("IntFloat", StrictInt, StrictFloat)
 
-SupportedDriver = t.Literal["scrapli", "netmiko", "hyperglass_agent"]
+SupportedDriver = t.Literal["netmiko", "hyperglass_agent"]
 HttpAuthMode = t.Literal["basic", "api_key"]
 HttpProvider = t.Literal["msteams", "slack", "generic"]
 LogFormat = t.Literal["text", "json"]

diff --git a/pyproject.toml b/pyproject.toml
@@ -48,7 +48,6 @@ pydantic = {extras = ["dotenv"], version = "^1.8.2"}
 python = ">=3.8.1,<4.0"
 redis = "^3.5.3"
 rich = "^10.11.0"
-scrapli = {version = "2021.07.30", extras = ["asyncssh"]}
 typer = "^0.4.0"
 typing-extensions = "^3.7.4"
 uvicorn = {extras = ["standard"], version = "^0.13.4"}