Merge branch 'develop' into improve_paramiko_cleanup

Author: ktbyers

docs/netmiko/a10/a10_ssh.html

@@ -178,6 +178,27 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         # self.set_terminal_width()
         self.disable_paging(command=&#34;terminal length 0&#34;)
 
+    def check_config_mode(
+        self, check_string: str = &#34;)#&#34;, pattern: str = &#34;)#&#34;, force_regex: bool = False
+    ) -&gt; bool:
+        self.write_channel(self.RETURN)
+
+        # You can encounter an issue here (on router name changes) prefer delay-based solution
+        if not pattern:
+            output = self.read_channel_timing(read_timeout=10.0)
+        else:
+            output = self.read_until_pattern(pattern=pattern)
+
+        # A10 can do this &#39;LBR1_PROD-EXT_(NOLICENSE)#&#39; when not licensed (e.g. gns3)
+        # Example, config: LBR1_PROD-EXT_(config)(NOLICENSE)#
+        # Example, outside of config LBR1_PROD-EXT_(NOLICENSE)#
+        output = output.replace(&#34;(NOLICENSE)&#34;, &#34;&#34;)
+
+        if force_regex:
+            return bool(re.search(check_string, output))
+        else:
+            return check_string in output
+
     def save_config(
         self, cmd: str = &#34;&#34;, confirm: bool = False, confirm_response: str = &#34;&#34;
     ) -&gt; str:

docs/netmiko/a10/index.html

@@ -184,6 +184,27 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         # self.set_terminal_width()
         self.disable_paging(command=&#34;terminal length 0&#34;)
 
+    def check_config_mode(
+        self, check_string: str = &#34;)#&#34;, pattern: str = &#34;)#&#34;, force_regex: bool = False
+    ) -&gt; bool:
+        self.write_channel(self.RETURN)
+
+        # You can encounter an issue here (on router name changes) prefer delay-based solution
+        if not pattern:
+            output = self.read_channel_timing(read_timeout=10.0)
+        else:
+            output = self.read_until_pattern(pattern=pattern)
+
+        # A10 can do this &#39;LBR1_PROD-EXT_(NOLICENSE)#&#39; when not licensed (e.g. gns3)
+        # Example, config: LBR1_PROD-EXT_(config)(NOLICENSE)#
+        # Example, outside of config LBR1_PROD-EXT_(NOLICENSE)#
+        output = output.replace(&#34;(NOLICENSE)&#34;, &#34;&#34;)
+
+        if force_regex:
+            return bool(re.search(check_string, output))
+        else:
+            return check_string in output
+
     def save_config(
         self, cmd: str = &#34;&#34;, confirm: bool = False, confirm_response: str = &#34;&#34;
     ) -&gt; str:

docs/netmiko/arista/arista.html

@@ -171,8 +171,12 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         &#34;&#34;&#34;Prepare the session after the connection has been established.&#34;&#34;&#34;
         self.ansi_escape_codes = True
         self._test_channel_read(pattern=self.prompt_pattern)
-        cmd = &#34;terminal width 511&#34;
-        self.set_terminal_width(command=cmd, pattern=r&#34;Width set to&#34;)
+        try:
+            cmd = &#34;terminal width 511&#34;
+            self.set_terminal_width(command=cmd, pattern=r&#34;Width set to&#34;)
+        except NetmikoTimeoutException:
+            # Continue on if setting &#39;terminal width&#39; fails
+            pass
         self.disable_paging(cmd_verify=False, pattern=r&#34;Pagination disabled&#34;)
         self.set_base_prompt()
 
@@ -369,6 +373,8 @@ <h3>Inherited members</h3>
 <pre><code class="python">class AristaFileTransfer(CiscoFileTransfer):
     &#34;&#34;&#34;Arista SCP File Transfer driver.&#34;&#34;&#34;
 
+    prompt_pattern = r&#34;[$&gt;#]&#34;
+
     def __init__(
         self,
         ssh_conn: &#34;BaseConnection&#34;,
@@ -389,6 +395,7 @@ <h3>Inherited members</h3>
 
     def remote_space_available(self, search_pattern: str = &#34;&#34;) -&gt; int:
         &#34;&#34;&#34;Return space available on remote device.&#34;&#34;&#34;
+        search_pattern = self.prompt_pattern
         return self._remote_space_available_unix(search_pattern=search_pattern)
 
     def check_file_exists(self, remote_cmd: str = &#34;&#34;) -&gt; bool:
@@ -427,6 +434,13 @@ <h3>Ancestors</h3>
 <li><a title="netmiko.cisco_base_connection.CiscoFileTransfer" href="../cisco_base_connection.html#netmiko.cisco_base_connection.CiscoFileTransfer">CiscoFileTransfer</a></li>
 <li><a title="netmiko.scp_handler.BaseFileTransfer" href="../scp_handler.html#netmiko.scp_handler.BaseFileTransfer">BaseFileTransfer</a></li>
 </ul>
+<h3>Class variables</h3>
+<dl>
+<dt id="netmiko.arista.arista.AristaFileTransfer.prompt_pattern"><code class="name">var <span class="ident">prompt_pattern</span></code></dt>
+<dd>
+<div class="desc"></div>
+</dd>
+</dl>
 <h3>Inherited members</h3>
 <ul class="hlist">
 <li><code><b><a title="netmiko.cisco_base_connection.CiscoFileTransfer" href="../cisco_base_connection.html#netmiko.cisco_base_connection.CiscoFileTransfer">CiscoFileTransfer</a></b></code>:
@@ -858,6 +872,9 @@ <h4><code><a title="netmiko.arista.arista.AristaBase" href="#netmiko.arista.aris
 </li>
 <li>
 <h4><code><a title="netmiko.arista.arista.AristaFileTransfer" href="#netmiko.arista.arista.AristaFileTransfer">AristaFileTransfer</a></code></h4>
+<ul class="">
+<li><code><a title="netmiko.arista.arista.AristaFileTransfer.prompt_pattern" href="#netmiko.arista.arista.AristaFileTransfer.prompt_pattern">prompt_pattern</a></code></li>
+</ul>
 </li>
 <li>
 <h4><code><a title="netmiko.arista.arista.AristaSSH" href="#netmiko.arista.arista.AristaSSH">AristaSSH</a></code></h4>

docs/netmiko/arista/index.html

@@ -55,6 +55,8 @@ <h2 class="section-title" id="header-classes">Classes</h2>
 <pre><code class="python">class AristaFileTransfer(CiscoFileTransfer):
     &#34;&#34;&#34;Arista SCP File Transfer driver.&#34;&#34;&#34;
 
+    prompt_pattern = r&#34;[$&gt;#]&#34;
+
     def __init__(
         self,
         ssh_conn: &#34;BaseConnection&#34;,
@@ -75,6 +77,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
 
     def remote_space_available(self, search_pattern: str = &#34;&#34;) -&gt; int:
         &#34;&#34;&#34;Return space available on remote device.&#34;&#34;&#34;
+        search_pattern = self.prompt_pattern
         return self._remote_space_available_unix(search_pattern=search_pattern)
 
     def check_file_exists(self, remote_cmd: str = &#34;&#34;) -&gt; bool:
@@ -113,6 +116,13 @@ <h3>Ancestors</h3>
 <li><a title="netmiko.cisco_base_connection.CiscoFileTransfer" href="../cisco_base_connection.html#netmiko.cisco_base_connection.CiscoFileTransfer">CiscoFileTransfer</a></li>
 <li><a title="netmiko.scp_handler.BaseFileTransfer" href="../scp_handler.html#netmiko.scp_handler.BaseFileTransfer">BaseFileTransfer</a></li>
 </ul>
+<h3>Class variables</h3>
+<dl>
+<dt id="netmiko.arista.AristaFileTransfer.prompt_pattern"><code class="name">var <span class="ident">prompt_pattern</span></code></dt>
+<dd>
+<div class="desc"></div>
+</dd>
+</dl>
 <h3>Inherited members</h3>
 <ul class="hlist">
 <li><code><b><a title="netmiko.cisco_base_connection.CiscoFileTransfer" href="../cisco_base_connection.html#netmiko.cisco_base_connection.CiscoFileTransfer">CiscoFileTransfer</a></b></code>:
@@ -539,6 +549,9 @@ <h3>Inherited members</h3>
 <ul>
 <li>
 <h4><code><a title="netmiko.arista.AristaFileTransfer" href="#netmiko.arista.AristaFileTransfer">AristaFileTransfer</a></code></h4>
+<ul class="">
+<li><code><a title="netmiko.arista.AristaFileTransfer.prompt_pattern" href="#netmiko.arista.AristaFileTransfer.prompt_pattern">prompt_pattern</a></code></li>
+</ul>
 </li>
 <li>
 <h4><code><a title="netmiko.arista.AristaSSH" href="#netmiko.arista.AristaSSH">AristaSSH</a></code></h4>