Merge "Bug 1015953 - linuxbridge_quantum_agent device_exists() is buggy"

2012-06-21 13:32:40 +00:00
parent e5e6671dc4 79d0bd7124
commit 523b90be60
1 changed files with 5 additions and 5 deletions
--- a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
+++ b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
@@ -66,12 +66,12 @@ class LinuxBridge:

    def device_exists(self, device):
        """Check if ethernet device exists."""
-        retval = utils.execute(['ip', 'link', 'show',
-                                'dev', device], root_helper=self.root_helper)
-        if retval:
-            return True
-        else:
+        try:
+            utils.execute(['ip', 'link', 'show', 'dev', device],
+                          root_helper=self.root_helper)
+        except RuntimeError:
            return False
+        return True

    def get_bridge_name(self, network_id):
        if not network_id: