Handle switch comms better
Change-Id: Icf12cd4238402c84615a2e6d3b3b357d4fef5c54
diff --git a/drivers/CiscoCatalyst.py b/drivers/CiscoCatalyst.py
index 6452cc2..a5af25b 100644
--- a/drivers/CiscoCatalyst.py
+++ b/drivers/CiscoCatalyst.py
@@ -236,6 +236,8 @@
mode = match.group(1)
if mode == 'static access':
return 'access'
+ if mode == 'dynamic auto':
+ return 'trunk'
return mode
# Set an access port to be in a specified VLAN (tag)
@@ -417,6 +419,7 @@
# match interfaces that exist
regex = re.compile('^\s*([a-zA-Z0-9_/]*).*(connect)(.*)')
regex1 = re.compile('.*Not Present.*')
+ regex2 = re.compile('.*routed.*')
self._cli("show interfaces status")
for line in self._read_paged_output():
@@ -426,7 +429,9 @@
junk = match.group(3)
match1 = regex1.match(junk) # Deliberately drop things
# marked as "Not Present"
- if not match1:
+ match2 = regex2.match(junk) # Deliberately drop things
+ # marked as "routed"
+ if not match1 and not match2:
interfaces.append(interface)
return interfaces