napalm-automation
diff --git a/Diff for: ‎.github/ISSUE_TEMPLATE
+36 b/Diff for: ‎.github/ISSUE_TEMPLATE
+36
diff --git a/Diff for: ‎Dockerfile
+7-12 b/Diff for: ‎Dockerfile
+7-12
diff --git a/Diff for: ‎docs/contributing/index.rst
+24-1 b/Diff for: ‎docs/contributing/index.rst
+24-1
diff --git a/Diff for: ‎docs/installation/index.rst
+19 b/Diff for: ‎docs/installation/index.rst
+19
diff --git a/Diff for: ‎docs/installation/ios.rst
-8 b/Diff for: ‎docs/installation/ios.rst
-8
diff --git a/Diff for: ‎docs/installation/iosxr.rst
-8 b/Diff for: ‎docs/installation/iosxr.rst
-8
diff --git a/Diff for: ‎docs/installation/junos.rst
-7 b/Diff for: ‎docs/installation/junos.rst
-7
diff --git a/Diff for: ‎docs/validate/index.rst
+1-1 b/Diff for: ‎docs/validate/index.rst
+1-1
diff --git a/Diff for: ‎napalm/base/base.py
+24-8 b/Diff for: ‎napalm/base/base.py
+24-8
diff --git a/Diff for: ‎napalm/base/clitools/cl_napalm.py
+3 b/Diff for: ‎napalm/base/clitools/cl_napalm.py
+3
diff --git a/Diff for: ‎napalm/base/helpers.py
+63 b/Diff for: ‎napalm/base/helpers.py
+63
diff --git a/Diff for: ‎napalm/base/test/models.py
+1 b/Diff for: ‎napalm/base/test/models.py
+1
@@ -0,0 +1,36 @@
+### Description of Issue/Question
+
+*Note*: Please check https://guides.github.com/features/mastering-markdown/
+to see how to properly format your request.
+
+### Did you follow the steps from https://github.com/napalm-automation/napalm#faq
+(Place an ``x`` between the square brackets where applicable)
+
+- [] Yes
+- [] No
+
+
+### Setup
+
+### napalm version
+(Paste verbatim output from `pip freeze | grep napalm` between quotes below)
+
+```
+
+```
+
+### Network operating system version
+(Paste verbatim output from `show version` - or equivalent - between quotes below)
+
+```
+
+```
+
+### Steps to Reproduce the Issue
+
+### Error Traceback
+(Paste the complete traceback of the exception between quotes below)
+
+```
+
+```
@@ -1,15 +1,10 @@
-FROM debian:stretch
-
-## Install min deps
-RUN apt-get update
+FROM python:3.6-slim-stretch
 
 COPY ./ /var/cache/napalm/
 
-## Install NAPALM & underlying libraries dependencies
-RUN apt-get install -y python-cffi python-dev libxslt1-dev libssl-dev libffi-dev \
-    && apt-get install -y python-pip \
-    && pip install -U cffi \
-    && pip install -U cryptography \
-    && pip install /var/cache/napalm/
-
-RUN rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+ && apt-get install -y python-dev python-cffi libxslt1-dev libssl-dev libffi-dev \
+ && apt-get autoremove \
+ && rm -rf /var/lib/apt/lists/* \
+ && pip --no-cache-dir install -U cffi cryptography /var/cache/napalm/ \
+ && rm -rf /var/cache/napalm/
@@ -44,7 +44,27 @@ If you found a bug and know how to fix just contribute the bugfix. It might be i
 Documentation
 -------------
 
-Just do it! :)
+The documentation is built using `Sphinx`_ and hosted on Read the Docs. The docs
+are kept in the ``docs/`` directory at the top of the source tree.
+
+To make changes, it is preferable to set up a `python virtual environment`_
+called ``env`` and activate it.
+
+Next, install the documentation dependencies using ``pip``:
+
+.. code:: console
+
+   pip install -r docs/requirements.txt
+
+Make your changes and then check them for correctness by building them locally:
+
+.. code:: console
+
+   # in the docs directory
+   make html
+
+.. tip:: If it is a simple change to a single page, you can use the "Edit on
+   GitHub" button in the upper right hand corner of the page in question.
 
 Proposing a new driver
 ----------------------
@@ -58,3 +78,6 @@ Please check :ref:`contributing-drivers` to understand the process.
 
    core
    drivers
+
+.. _python virtual environment: https://packaging.python.org/guides/installing-using-pip-and-virtualenv/
+.. _Sphinx: http://www.sphinx-doc.org/en/master/
@@ -14,6 +14,25 @@ You can install napalm with pip:
 That will install all the drivers currently available.
 
 
+OS Package Managers
+-------------------
+
+Some execution environments offer napalm through a system-level package manager. Installing with pip outside of a user profile or virtualenv/venv is inadvisable in these cases.
+
+FreeBSD
+~~~~~~~
+
+.. code-block:: bash
+
+    pkg install net-mgmt/py-napalm
+
+This will install napalm and all drivers and dependencies for the default version(s) of python. To install for a specific version, python X.Y, if supported:
+
+.. code-block:: bash
+
+    pkg install pyXY-napalm
+
+
 Dependencies
 ------------
 
 
@@ -15,11 +15,3 @@ RedHat and CentOS
 .. code-block:: bash
 
     sudo yum install -y python-pip gcc openssl openssl-devel libffi-devel python-devel
-
-
-FreeBSD
--------
-
-.. code-block:: bash
-
-    sudo pkg_add -r py27-pip
@@ -15,11 +15,3 @@ RedHat and CentOS
 .. code-block:: bash
 
     sudo yum install -y python-pip gcc openssl openssl-devel libffi-devel python-devel
-
-
-FreeBSD
--------
-
-.. code-block:: bash
-
-    sudo pkg_add -r py27-pip
@@ -15,10 +15,3 @@ RedHat and CentOS
 .. code-block:: bash
 
     sudo yum install -y python-pip python-devel libxml2-devel libxslt-devel gcc openssl openssl-devel libffi-devel
-
-FreeBSD
--------
-
-.. code-block:: bash
-
-    sudo pkg_add -r py27-pip libxml2 libxslt
@@ -263,7 +263,7 @@ CLI & Ansible
 If you prefer, you can also make use of the validate functionality via the CLI with the command ``cl_napalm_validate`` or with ansible plugin. You can find more information about them here:
 
 * CLI - https://github.com/napalm-automation/napalm/pull/168
-* Ansible - https://github.com/napalm-automation/napalm-ansible/blob/master/library/napalm_validate.py
+* Ansible - https://github.com/napalm-automation/napalm-ansible/blob/master/napalm_ansible/modules/napalm_validate.py
 
 
 Why this and what's next
 
@@ -16,14 +16,16 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import sys
+
+from netmiko import ConnectHandler, NetMikoTimeoutException
+
 # local modules
 import napalm.base.exceptions
-from napalm.base.exceptions import ConnectionException
 import napalm.base.helpers
 from napalm.base import constants as c
 from napalm.base import validate
-
-from netmiko import ConnectHandler, NetMikoTimeoutException
+from napalm.base.exceptions import ConnectionException
 
 
 class NetworkDriver(object):
@@ -44,8 +46,15 @@ def __init__(self, hostname, username, password, timeout=60, optional_args=None)
         raise NotImplementedError
 
     def __enter__(self):
-        self.open()
-        return self
+        try:
+            self.open()
+            return self
+        except:  # noqa: E722
+            # Swallow exception if __exit__ returns a True value
+            if self.__exit__(*sys.exc_info()):
+                pass
+            else:
+                raise
 
     def __exit__(self, exc_type, exc_value, exc_traceback):
         self.close()
@@ -95,8 +104,9 @@ def _netmiko_open(self, device_type, netmiko_optional_args=None):
 
     def _netmiko_close(self):
         """Standardized method of closing a Netmiko connection."""
-        self.device.disconnect()
-        self._netmiko_device = None
+        if getattr(self, "_netmiko_device", None):
+            self._netmiko_device.disconnect()
+            self._netmiko_device = None
         self.device = None
 
     def open(self):
@@ -268,6 +278,7 @@ def get_interfaces(self):
          * description (string)
          * last_flapped (float in seconds)
          * speed (int in Mbit)
+         * MTU (in Bytes)
          * mac_address (string)
 
         Example::
@@ -280,6 +291,7 @@ def get_interfaces(self):
                 'description': '',
                 'last_flapped': -1.0,
                 'speed': 1000,
+                'mtu': 1500,
                 'mac_address': 'FA:16:3E:57:33:61',
                 },
             u'Ethernet1':
@@ -289,6 +301,7 @@ def get_interfaces(self):
                 'description': 'foo',
                 'last_flapped': 1429978575.1554043,
                 'speed': 1000,
+                'mtu': 1500,
                 'mac_address': 'FA:16:3E:57:33:62',
                 },
             u'Ethernet2':
@@ -298,6 +311,7 @@ def get_interfaces(self):
                 'description': 'bla',
                 'last_flapped': 1429978575.1555667,
                 'speed': 1000,
+                'mtu': 1500,
                 'mac_address': 'FA:16:3E:57:33:63',
                 },
             u'Ethernet3':
@@ -307,6 +321,7 @@ def get_interfaces(self):
                 'description': 'bar',
                 'last_flapped': -1.0,
                 'speed': 1000,
+                'mtu': 1500,
                 'mac_address': 'FA:16:3E:57:33:64',
                 }
             }
@@ -1497,13 +1512,14 @@ def get_optics(self):
         """
         raise NotImplementedError
 
-    def get_config(self, retrieve="all"):
+    def get_config(self, retrieve="all", full=False):
         """
         Return the configuration of a device.
 
         Args:
             retrieve(string): Which configuration type you want to populate, default is all of them.
                               The rest will be set to "".
+            full(bool): Retrieve all the configuration. For instance, on ios, "sh run all".
 
         Returns:
           The object returned is a dictionary with a key for each configuration store:
 
@@ -146,6 +146,9 @@ def build_help():
     )
     args = parser.parse_args()
 
+    if not hasattr(args, "which"):
+        args.which = None
+
     if args.password is None:
         password = getpass.getpass("Enter password: ")
         setattr(args, "password", password)
 
@@ -6,6 +6,7 @@
 
 # std libs
 import os
+import re
 import sys
 import itertools
 
@@ -15,6 +16,7 @@
 from netaddr import EUI
 from netaddr import mac_unix
 from netaddr import IPAddress
+from ciscoconfparse import CiscoConfParse
 
 # local modules
 import napalm.base.exceptions
@@ -108,6 +110,67 @@ def load_template(
     return cls.load_merge_candidate(config=configuration)
 
 
+def cisco_conf_parse_parents(parent, child, config):
+    """
+    Use CiscoConfParse to find parent lines that contain a specific child line.
+
+    :param parent: The parent line to search for
+    :param child:  The child line required under the given parent
+    :param config: The device running/startup config
+    """
+    if type(config) == str:
+        config = config.splitlines()
+    parse = CiscoConfParse(config)
+    cfg_obj = parse.find_parents_w_child(parent, child)
+    return cfg_obj
+
+
+def cisco_conf_parse_objects(cfg_section, config):
+    """
+    Use CiscoConfParse to find and return a section of Cisco IOS config.
+    Similar to "show run | section <cfg_section>"
+
+    :param cfg_section: The section of the config to return eg. "router bgp"
+    :param config: The running/startup config of the device to parse
+    """
+    return_config = []
+    if type(config) is str:
+        config = config.splitlines()
+    parse = CiscoConfParse(config)
+    cfg_obj = parse.find_objects(cfg_section)
+    for parent in cfg_obj:
+        return_config.append(parent.text)
+        for child in parent.all_children:
+            return_config.append(child.text)
+    return return_config
+
+
+def regex_find_txt(pattern, text, default=""):
+    """""
+    RegEx search for pattern in text. Will try to match the data type of the "default" value
+    or return the default value if no match is found.
+    This is to parse IOS config like below:
+    regex_find_txt(r"remote-as (65000)", "neighbor 10.0.0.1 remote-as 65000", default=0)
+    RETURNS: 65001
+
+    :param pattern: RegEx pattern to match on
+    :param text: String of text ot search for "pattern" in
+    :param default="": Default value and type to return on error
+    """
+    text = str(text)
+    value = re.findall(pattern, text)
+    try:
+        if not value:
+            raise Exception
+        if not isinstance(value, type(default)):
+            if isinstance(value, list) and len(value) == 1:
+                value = value[0]
+            value = type(default)(value)
+    except Exception:  # in case of any exception, returns default
+        value = default
+    return value
+
+
 def textfsm_extractor(cls, template_name, raw_text):
     """
     Applies a TextFSM template over a raw text and return the matching table.
 
@@ -19,6 +19,7 @@
     "is_enabled": bool,
     "description": text_type,
     "last_flapped": float,
+    "mtu": int,
     "speed": int,
     "mac_address": text_type,
 }
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,9 @@ def build_help():`
`146`	`146`	`)`
`147`	`147`	`args = parser.parse_args()`
`148`	`148`
	`149`	`+ if not hasattr(args, "which"):`
	`150`	`+ args.which = None`
	`151`	`+`
`149`	`152`	`if args.password is None:`
`150`	`153`	`password = getpass.getpass("Enter password: ")`
`151`	`154`	`setattr(args, "password", password)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`"is_enabled": bool,`
`20`	`20`	`"description": text_type,`
`21`	`21`	`"last_flapped": float,`
	`22`	`+ "mtu": int,`
`22`	`23`	`"speed": int,`
`23`	`24`	`"mac_address": text_type,`
`24`	`25`	`}`