Merge pull request #34 from napalm-automation-community/develop

Release 4.0.2

napalm_mos/mos.py

@@ -246,7 +246,7 @@ def _load_config(self, filename=None, config=None, replace=False):
 
         if filename is not None:
             with open(filename, "r") as f:
-                self._candidate = f.readlines()
+                lines = f.readlines()
         else:
             if isinstance(config, list):
                 lines = config
@@ -260,7 +260,8 @@ def _load_config(self, filename=None, config=None, replace=False):
                 continue
             self._candidate.append(line)
 
-        self._candidate.append("end")
+        if self._candidate[-1] != "end":
+            self._candidate.append("end")
         if any(
             "source mac" in line for line in self._candidate
         ) and self._version < LooseVersion("0.19.2"):
@@ -523,7 +524,6 @@ def _transform_lldp_capab(self, capabilities):
         )
 
     def get_lldp_neighbors_detail(self, interface=""):
-
         lldp_neighbors_out = {}
 
         commands = ["show lldp neighbor {} verbose".format(interface)]
@@ -535,10 +535,8 @@ def get_lldp_neighbors_detail(self, interface=""):
         interface_list = zip(*(iter(interfaces_split),) * 2)
 
         for interface, interface_str in interface_list:
-
             lldp_neighbors_out[interface] = []
             for neighbor_str in interface_str.strip().split("\n\n"):
-
                 info_dict = {}
 
                 for info_line in neighbor_str.strip().splitlines():
@@ -615,7 +613,6 @@ def cli(self, commands, encoding="text"):
         return cli_output
 
     def get_arp_table(self, vrf=""):
-
         if vrf:
             raise NotImplementedError("Metamako MOS does not support multiple VRFs")
 
@@ -727,7 +724,6 @@ def get_snmp_information(self):
 
         community_outputs = snmp_config[3]["output"].split("\n\n")
         for community_output in community_outputs:
-
             match = self._RE_SNMP_COMM.search(community_output)
             if match:
                 matches = match.groupdict("")

setup.py

@@ -1,4 +1,5 @@
 """setup.py file."""
+
 from setuptools import setup, find_packages
 
 __author__ = "Benny Holmgren <benny@holmgren.id.au>"
@@ -8,7 +9,7 @@
 
 setup(
     name="napalm-mos",
-    version="4.0.1",
+    version="4.0.2",
     packages=find_packages(),
     author="Benny Holmgren, Brandon Ewing",
     author_email="benny@holmgren.id.au, brandon.ewing@warningg.com",

test/unit/conftest.py

@@ -1,4 +1,5 @@
 """Test fixtures."""
+
 from builtins import super
 
 import pytest