aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve McIntyre <steve.mcintyre@linaro.org>2015-07-24 17:03:31 +0100
committerSteve McIntyre <steve.mcintyre@linaro.org>2015-07-24 17:03:31 +0100
commitb79cea5c23ae5b5dbe89c2ef9ca98e5c61da357d (patch)
tree71258ffff53c5c0f8ba5def3ab548c8396cb5ff0
parent857d89f704913ae9b05e33a0eaa2371187346ae9 (diff)
In port_set_mode(), verify the uncached _port_get_mode()
Otherwise we'll get old data and things will fail. Change-Id: Ibeebf197799ef98ac655e5fc0f14c438115e1f0d
-rw-r--r--drivers/CiscoSX300.py2
-rw-r--r--drivers/NetgearXSM.py2
-rw-r--r--drivers/TPLinkTLSG2XXX.py5
3 files changed, 7 insertions, 2 deletions
diff --git a/drivers/CiscoSX300.py b/drivers/CiscoSX300.py
index 54d318e..188926b 100644
--- a/drivers/CiscoSX300.py
+++ b/drivers/CiscoSX300.py
@@ -212,7 +212,7 @@ class CiscoSX300(SwitchDriver):
self._end_configure()
# Validate it happened
- read_mode = self.port_get_mode(port)
+ read_mode = self._port_get_mode(port)
if read_mode != mode:
raise IOError("Failed to set mode for port %s" % port)
diff --git a/drivers/NetgearXSM.py b/drivers/NetgearXSM.py
index 61a3706..c575aec 100644
--- a/drivers/NetgearXSM.py
+++ b/drivers/NetgearXSM.py
@@ -248,7 +248,7 @@ class NetgearXSM(SwitchDriver):
self._end_configure()
# Validate it happened
- read_mode = self.port_get_mode(port)
+ read_mode = self._port_get_mode(port)
if read_mode != mode:
raise IOError("Failed to set mode for port %s" % port)
diff --git a/drivers/TPLinkTLSG2XXX.py b/drivers/TPLinkTLSG2XXX.py
index 3ed9464..272bf1a 100644
--- a/drivers/TPLinkTLSG2XXX.py
+++ b/drivers/TPLinkTLSG2XXX.py
@@ -238,6 +238,11 @@ class TPLinkTLSG2XXX(SwitchDriver):
self.port_set_access_vlan(port, 1)
self._set_pvid(port, 1)
+ # Validate it happened
+ read_mode = self._port_get_mode(port)
+ if read_mode != mode:
+ raise IOError("Failed to set mode for port %s" % port)
+
# And cache the result
self._port_modes[port] = mode