From f88d911fb5f73ef575ec840ca71dbca2061db6f5 Mon Sep 17 00:00:00 2001 From: "t.moriyama" Date: Fri, 14 Jun 2013 22:20:36 +0900 Subject: [PATCH] fix LinuxVlanAgent --- linkpair/collect/agent/linuxvlan_agent.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/linkpair/collect/agent/linuxvlan_agent.py b/linkpair/collect/agent/linuxvlan_agent.py index 11fa522..95613e0 100755 --- a/linkpair/collect/agent/linuxvlan_agent.py +++ b/linkpair/collect/agent/linuxvlan_agent.py @@ -20,16 +20,8 @@ class LinuxVlanAgent(BaseAgent): self.pick_vlan_configuration() def pick_vlan_configuration(self): - if_name = "" vlan_config_file = "/proc/net/vlan/config" - if os.path.exists(vlan_config_file): - vlan_configs = [] - result = open(vlan_config_file, "r") - for vlan_config in result: - vlan_configs.append(vlan_config) - else: - return - + vlan_configs = self._runner.exec_cmd("cat " + vlan_config_file) for if_line in vlan_configs[2:]: if_line = if_line.rstrip() if self._u.d_push(re.match(r'^(\S+)\s*\|\s*(\S+)\s*\|\s*(\S+)', if_line)) is not None: -- 2.11.0