From 8dbb3d63586b40d30d6fa23ec41deae0dc7b6aea Mon Sep 17 00:00:00 2001 From: Hui Xiang Date: Wed, 17 Dec 2014 14:19:16 +0800 Subject: [PATCH] Fix a bit --- files/monitor.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/monitor.py b/files/monitor.py index 7b8615f1..87431ac9 100644 --- a/files/monitor.py +++ b/files/monitor.py @@ -123,7 +123,7 @@ class MonitorNeutronAgentsDaemon(Daemon): def get_root_helper(self): return 'sudo' - def unplug_device(self, conf, device): + def unplug_device(self, device): try: device.link.delete() except RuntimeError: @@ -143,9 +143,9 @@ class MonitorNeutronAgentsDaemon(Daemon): for network, agent in networks.iteritems(): namespaces.append('qdhcp-' + network) else: - cmd = ['sudo', 'ip', 'netns', '|', 'grep', 'qdhcp'] + cmd = 'sudo ip netns | grep qdhcp' try: - qns = subprocess.call(cmd).strip().split(' ') + qns = subprocess.check_output(cmd, True).strip().split(' ') for qn in qns: namespaces.append(qn) except Exception: @@ -161,9 +161,9 @@ class MonitorNeutronAgentsDaemon(Daemon): for router, agent in routers.iteritems(): namespaces.append('qrouter-' + router) else: - cmd = ['sudo', 'ip', 'netns', '|', 'grep', 'qrouter'] + cmd = 'sudo ip netns | grep qrouter' try: - qns = subprocess.call(cmd).strip().split(' ') + qns = subprocess.check_output(cmd, True).strip().split(' ') for qn in qns: namespaces.append(qn) except Exception: