Merge branch 'develop' into fix-napalm-automation#1569

DavidVentura · Mar 25, 2022 · 48c4e5b · 48c4e5b
2 parents 10fcc63 + 31acd89
commit 48c4e5b
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 42 deletions.
diff --git a/napalm/base/base.py b/napalm/base/base.py
@@ -26,8 +26,7 @@
 from napalm.base import constants as c
 from napalm.base import validate
 from napalm.base.exceptions import ConnectionException
-from napalm.base.test import models
-from napalm.base.test.models import NTPStats
+from napalm.base import models
 
 
 class NetworkDriver(object):
@@ -938,7 +937,7 @@ def get_ntp_servers(self) -> Dict[str, models.NTPServerDict]:
 
         raise NotImplementedError
 
-    def get_ntp_stats(self) -> List[NTPStats]:
+    def get_ntp_stats(self) -> List[models.NTPStats]:
 
         """
         Returns a list of NTP synchronization statistics.

diff --git a/napalm/base/helpers.py b/napalm/base/helpers.py
@@ -28,7 +28,7 @@
 # local modules
 import napalm.base.exceptions
 from napalm.base import constants
-from napalm.base.test.models import ConfigDict
+from napalm.base.models import ConfigDict
 from napalm.base.utils.jinja_filters import CustomJinjaFilters
 from napalm.base.canonical_map import base_interfaces, reverse_mapping
 

diff --git a/napalm/base/mock.py b/napalm/base/mock.py
@@ -25,7 +25,7 @@
 
 from pydoc import locate
 
-from napalm.base.test import models
+from napalm.base import models
 
 
 def raise_exception(result):  # type: ignore

diff --git a/napalm/base/test/models.py → napalm/base/models.py b/napalm/base/test/models.py → napalm/base/models.py
@@ -400,31 +400,6 @@
 
 ConfigDict = TypedDict("ConfigDict", {"running": str, "startup": str, "candidate": str})
 
-TracerouteResultDictEntry = TypedDict(
-    "TracerouteResultDictEntry", {"probes": Dict[int, TracerouteDict]}
-)
-
-OpticsStateDict = TypedDict(
-    "OpticsStateDict", {"instant": float, "avg": float, "min": float, "max": float}
-)
-
-OpticsStatePerChannelDict = TypedDict(
-    "OpticsStatePerChannelDict",
-    {
-        "input_power": OpticsStateDict,
-        "output_power": OpticsStateDict,
-        "laser_bias_current": OpticsStateDict,
-    },
-)
-
-OpticsPerChannelDict = TypedDict(
-    "OpticsPerChannelDict", {"index": int, "state": OpticsStatePerChannelDict}
-)
-
-OpticsPhysicalChannelsDict = TypedDict(
-    "OpticsPhysicalChannelsDict", {"channels": OpticsPerChannelDict}
-)
-
 NetworkInstanceDict = TypedDict(
     "NetworkInstanceDict", {"name": str, "type": str, "state": dict, "interfaces": dict}
 )

diff --git a/napalm/base/test/base.py b/napalm/base/test/base.py
@@ -13,7 +13,7 @@
 # the License.
 import difflib
 from napalm.base import exceptions
-from napalm.base.test import models
+from napalm.base import models
 from unittest import SkipTest
 
 

diff --git a/napalm/base/test/getters.py b/napalm/base/test/getters.py
@@ -6,7 +6,7 @@
 
 import pytest
 from napalm.base.test import helpers
-from napalm.base.test import models
+from napalm.base import models
 from napalm.base import NetworkDriver
 from napalm.base.test import conftest
 

diff --git a/napalm/base/validate.py b/napalm/base/validate.py
@@ -11,7 +11,7 @@
 if TYPE_CHECKING:
     from napalm.base import NetworkDriver
 from napalm.base.exceptions import ValidationException
-from napalm.base.test import models
+from napalm.base import models
 
 
 # We put it here to compile it only once

diff --git a/napalm/nxos/nxos.py b/napalm/nxos/nxos.py
@@ -59,7 +59,7 @@
 from napalm.base.helpers import as_number
 from napalm.base.helpers import generate_regex_or
 from napalm.base.netmiko_helpers import netmiko_args
-from napalm.base.test import models
+from napalm.base import models
 from napalm.nxapi_plumbing import Device as NXOSDevice
 from napalm.nxapi_plumbing import (
     NXAPIAuthError,

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -9,10 +9,10 @@ pytest-pythonpath==0.7.4
 pylama==7.7.1
 mock==4.0.3
 tox==3.24.5
-mypy==0.931
-types-requests==2.27.9
-types-six==1.16.10
-types-setuptools==57.4.9
-types-PyYAML==6.0.4
+mypy==0.941
+types-requests==2.27.14
+types-six==1.16.12
+types-setuptools==57.4.11
+types-PyYAML==6.0.5
 ttp==0.8.4
 ttp_templates==0.1.3
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
     name="napalm",
-    version="3.4.0",
+    version="4.0.0",
     packages=find_packages(exclude=("test*",)),
     test_suite="test_base",
     author="David Barroso, Kirk Byers, Mircea Ulinic",

diff --git a/test/nxos/test_getters.py b/test/nxos/test_getters.py
@@ -2,7 +2,7 @@
 
 from napalm.base.test.getters import BaseTestGetters, wrap_test_cases
 from napalm.base.test import helpers
-from napalm.base.test import models
+from napalm.base import models
 
 import pytest
 from mock import patch

diff --git a/test/nxos_ssh/test_getters.py b/test/nxos_ssh/test_getters.py
@@ -2,7 +2,7 @@
 
 from napalm.base.test.getters import BaseTestGetters, wrap_test_cases
 from napalm.base.test import helpers
-from napalm.base.test import models
+from napalm.base import models
 
 import pytest
 from mock import patch