Merge pull request #179 from lindycoder/use_page_reader

Use a page reader for every "show" commands on dell powerconnect

Author: mat128

netman/adapters/switches/dell.py

@@ -15,15 +15,15 @@
 
 from netman.adapters.shell.ssh import SshClient
 from netman.adapters.shell.telnet import TelnetClient
-from netman.core.objects.interface_states import OFF, ON
+from netman.core.objects.interface_states import OFF
 from netman.core.objects.port_modes import TRUNK
 from netman.core.objects.port_modes import ACCESS
 from netman.core.objects.interface import Interface
 from netman.adapters.switches.cisco import parse_vlan_ranges
 from netman.core.objects.vlan import Vlan
 from netman import regex
 from netman.core.objects.switch_transactional import FlowControlSwitch
-from netman.adapters.switches.util import SubShell, no_output, ResultChecker
+from netman.adapters.switches.util import SubShell, no_output, ResultChecker, PageReader
 from netman.core.objects.exceptions import UnknownInterface, BadVlanName, \
     BadVlanNumber, UnknownVlan, InterfaceInWrongPortMode, NativeVlanNotSet, TrunkVlanNotSet, BadInterfaceDescription, \
     VlanAlreadyExist, UnknownBond, InvalidMtuSize, InterfaceResetIncomplete
@@ -55,6 +55,12 @@ def __init__(self, switch_descriptor, shell_factory):
         self.shell = None
         self.shell_factory = shell_factory
 
+        self.page_reader = PageReader(
+            read_while="--More-- or (q)uit",
+            and_press="m",
+            unless_prompt="#"
+        )
+
     def _connect(self):
         params = dict(
             host=self.switch_descriptor.hostname,
@@ -92,17 +98,13 @@ def set_interface_state(self, interface_id, state):
             self.shell.do('shutdown' if state is OFF else 'no shutdown')
 
     def get_vlans(self):
-        result = self.shell.do('show vlan', wait_for=("--More-- or (q)uit", "#"), include_last_line=True)
-        while len(result) > 0 and "--More--" in result[-1]:
-            result += self.shell.send_key("m", wait_for=("--More-- or (q)uit", "#"), include_last_line=True)
-
+        result = self.page_reader.do(self.shell, "show vlan")
         vlans = parse_vlan_list(result)
         return vlans
 
     def get_vlan(self, vlan_number):
-        result = self.shell.do("show vlan id {}".format(vlan_number), wait_for=("--More-- or (q)uit", "#"), include_last_line=True)
-        while len(result) > 0 and "--More--" in result[-1]:
-            result += self.shell.send_key("m", wait_for=("--More-- or (q)uit", "#"), include_last_line=True)
+        result = self.page_reader.do(self.shell, "show vlan id {}".format(vlan_number))
+
         if regex.match(".*\^.*", result[0]):
             raise BadVlanNumber()
         elif regex.match("^ERROR", result[0]):
@@ -111,9 +113,8 @@ def get_vlan(self, vlan_number):
         return vlan
 
     def get_vlan_interfaces(self, vlan_number):
-        result = self.shell.do("show vlan id {}".format(vlan_number), wait_for=("--More-- or (q)uit", "#"), include_last_line=True)
-        while len(result) > 0 and "--More--" in result[-1]:
-            result += self.shell.send_key("m", wait_for=("--More-- or (q)uit", "#"), include_last_line=True)
+        result = self.page_reader.do(self.shell, "show vlan id {}".format(vlan_number))
+
         if regex.match(".*\^.*", result[0]):
             raise BadVlanNumber()
         elif regex.match("^ERROR", result[0]):
@@ -125,17 +126,12 @@ def get_interface(self, interface_id):
         return self.read_interface(interface_id)
 
     def get_interfaces(self):
-        result = self.shell.do('show interfaces status', wait_for=("--More-- or (q)uit", "#"), include_last_line=True)
-        name_list = self.parse_interface_names(result)
-
-        while len(result) > 0 and "--More--" in result[-1]:
-            result = self.shell.send_key("m", wait_for=("--More-- or (q)uit", "#"), include_last_line=True)
-            name_list += self.parse_interface_names(result)
+        result = self.page_reader.do(self.shell, 'show interfaces status')
 
-        return [self.read_interface(name) for name in name_list]
+        return [self.read_interface(name) for name in self.parse_interface_names(result)]
 
     def add_vlan(self, number, name=None):
-        result = self.shell.do("show vlan id {}".format(number))
+        result = self.page_reader.do(self.shell, "show vlan id {}".format(number))
         if regex.match(".*\^.*", result[0]):
             raise BadVlanNumber()
         elif regex.match("^VLAN", result[0]):
@@ -306,7 +302,7 @@ def set(self, command, *arguments):
         return ResultChecker(result)
 
     def get_interface_data(self, interface_id):
-        interface_data = self.shell.do("show running-config interface {}".format(interface_id))
+        interface_data = self.page_reader.do(self.shell, "show running-config interface {}".format(interface_id))
         if any(["Invalid input" in line or regex.match("ERROR.*", line) for line in interface_data]):
             raise UnknownInterface(interface_id)
         return interface_data

netman/adapters/switches/dell10g.py

@@ -64,6 +64,16 @@ def get_vlan(self, number):
         else:
             return parse_vlan_list(result)[0]
 
+    def get_vlan_interfaces(self, vlan_number):
+        result = self.shell.do("show vlan id {}".format(vlan_number))
+
+        if regex.match(".*\^.*", result[0]):
+            raise BadVlanNumber()
+        elif regex.match("^ERROR", result[0]):
+            raise UnknownVlan(vlan_number)
+
+        return self.parse_interface_from_vlan_list(vlan_number, result)
+
     def get_interfaces(self):
         result = self.shell.do('show interfaces status')
         return [self.read_interface(name) for name in parse_interface_names(result)]

netman/adapters/switches/util.py

@@ -86,3 +86,22 @@ def on_result_matching(self, matcher, exception, *args, **kwargs):
         if regex.match(matcher, "\n".join(self.result), flags=re.DOTALL):
             raise exception(*args, **kwargs)
         return self
+
+
+class PageReader(object):
+    def __init__(self, read_while, and_press, unless_prompt):
+        self.next_page_indicator = read_while
+        self.continue_key = and_press
+        self.prompt = unless_prompt
+
+    def do(self, shell, command):
+        result = shell.do(command,
+                          wait_for=(self.next_page_indicator, self.prompt),
+                          include_last_line=True)
+
+        while len(result) > 0 and self.next_page_indicator in result[-1]:
+            result = result[:-1] + shell.send_key(self.continue_key,
+                                                  wait_for=(self.next_page_indicator, self.prompt),
+                                                  include_last_line=True)
+
+        return result[:-1]

tests/adapters/switches/dell10g_test.py

@@ -284,7 +284,7 @@ def test_get_vlan_with_unknown_number(self):
         assert_that(str(expect.exception), equal_to("Vlan 1210 not found"))
 
     def test_get_vlan_interfaces(self):
-        self.mocked_ssh_client.should_receive("do").with_args("show vlan id 1000", wait_for=("--More-- or (q)uit", "#"), include_last_line=True).once().ordered().and_return([
+        self.mocked_ssh_client.should_receive("do").with_args("show vlan id 1000").once().ordered().and_return([
             "VLAN       Name                         Ports          Type      Authorization",
             "-----  ---------------                  -------------  -----     -------------",
             "1000   MyVlanName                       Po2-3,Po5-7,   Static    Required",
@@ -296,7 +296,7 @@ def test_get_vlan_interfaces(self):
         assert_that(vlan_interfaces, equal_to(['port-channel 2', 'port-channel 3', 'port-channel 5', 'port-channel 6', 'port-channel 7', 'tengigabitethernet 0/0/1', 'tengigabitethernet 0/0/2']))
 
     def test_get_vlan_interfaces_with_unknown_vlan_raises(self):
-        self.mocked_ssh_client.should_receive("do").with_args("show vlan id 2019", wait_for=("--More-- or (q)uit", "#"), include_last_line=True).once().ordered().and_return([
+        self.mocked_ssh_client.should_receive("do").with_args("show vlan id 2019").once().ordered().and_return([
             "ERROR: This VLAN does not exist."
         ])