aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve McIntyre <steve.mcintyre@linaro.org>2014-12-23 16:36:35 +0000
committerSteve McIntyre <steve.mcintyre@linaro.org>2014-12-23 16:36:35 +0000
commitb9783ff64b9be96b1387e6e253fa5eade8b27708 (patch)
tree3a43311188fdc6a203ff42b98fe4bd1a71f72605
parent9f5a0238460d9d61624892343c7bf43ddc888753 (diff)
downloadvland-b9783ff64b9be96b1387e6e253fa5eade8b27708.tar.gz
Update device recognition text
Newer versions of the SX300 family have changed the System Description text. Grrr. Change-Id: Ic2fbf75b14b46e4135c8967641d6db41d1b77815
-rw-r--r--drivers/CiscoSX300.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/CiscoSX300.py b/drivers/CiscoSX300.py
index ce00187..38f5039 100644
--- a/drivers/CiscoSX300.py
+++ b/drivers/CiscoSX300.py
@@ -34,7 +34,7 @@ class CiscoSX300(SwitchDriver):
# Regexp of expected hardware information - fail if we don't see
# this
- _expected_descr_re = re.compile('S.300-\d+')
+ _expected_descr_re = re.compile('.*\d+-Port.*Managed Switch.*')
logfile = None
@@ -61,7 +61,7 @@ class CiscoSX300(SwitchDriver):
# And also validate them - make sure we're driving a switch of
# the correct model! Also store the serial number
- descr_regex = re.compile('System Description:.\s+(\S.*)')
+ descr_regex = re.compile('System Description:.\s+(.*)')
sn_regex = re.compile('SN:\s+(\S_)')
descr = ""