modify Collector, CollectorDataset for LinuxNetAgent

diff --git a/linkpair/collect/agent/base_agent.py b/linkpair/collect/agent/base_agent.py
index f31bd26..11594e8 100755 (executable)
--- a/linkpair/collect/agent/base_agent.py
+++ b/linkpair/collect/agent/base_agent.py
@@ -31,6 +31,7 @@ class BaseAgent(object):
         self._cu = cu
         self._remote_desc = remote_desc
         self._os_info = cd.os_info
+        self._linuxnet = cd.linuxnet
         self._linkpairs = cd.linkpairs
         self._port_to_br = cd.port_to_br
         self._iface_to_nss = cd.iface_to_nss

diff --git a/linkpair/collect/collector.py b/linkpair/collect/collector.py
index 2c24791..8e46891 100755 (executable)
--- a/linkpair/collect/collector.py
+++ b/linkpair/collect/collector.py
@@ -16,6 +16,7 @@ from linkpair.collect.utils import CollectUtils
 from linkpair.collect.collector_dataset import CollectorDataset
 from linkpair.collect.agent.commandrunner import CommandRunner
 from linkpair.collect.agent.linux_agent import LinuxAgent
+from linkpair.collect.agent.linuxnet_agent import LinuxNetAgent
 from linkpair.collect.agent.namespace_agent import NamespaceAgent
 from linkpair.collect.agent.veth_agent import VethAgent
 from linkpair.collect.agent.ovs_agent import OVSAgent
@@ -37,6 +38,7 @@ class Collector(object):
         self._devices = {}
         self._ports = {}
         self._os_info = {}
+        self._linuxnet = {}
         self._linkpairs = []
         self._port_to_br = {}
         self._iface_to_nss = {}
@@ -61,7 +63,7 @@ class Collector(object):
 
     def run(self):
         cd = CollectorDataset(
-            self._devices, self._ports, self._os_info, self._linkpairs,
+            self._devices, self._ports, self._os_info, self._linuxnet, self._linkpairs,
             self._port_to_br, self._iface_to_nss, self._veth_peer)
         cu = CollectUtils(
             cd, self._u, self._formatter)
@@ -70,6 +72,11 @@ class Collector(object):
                 self._runner, cu, self._remote_desc, cd, self._formatter)
             self._u.debug_out("OSAgent running...")
             os_agent.run()
+        if self._opts.disable_linuxnet_agent == False:
+            linuxnet_agent = LinuxNetAgent(
+                self._runner, cu, self._remote_desc, cd, self._formatter)
+            self._u.debug_out("LinuxNetAgent running...")
+            linuxnet_agent.run()
         if self._opts.disable_namespace_agent == False:
             namespace_agent = NamespaceAgent(
                 self._runner, cu, self._remote_desc, cd, self._formatter)

diff --git a/linkpair/collect/collector_dataset.py b/linkpair/collect/collector_dataset.py
index 4ad69bf..8465b0c 100755 (executable)
--- a/linkpair/collect/collector_dataset.py
+++ b/linkpair/collect/collector_dataset.py
@@ -9,10 +9,11 @@ from linkpair.linkpair import LinkPair
 
 class CollectorDataset(object):
 
-    def __init__(self, devices, ports, os_info, linkpairs, port_to_br, iface_to_nss, veth_peers):
+    def __init__(self, devices, ports, os_info, linuxnet, linkpairs, port_to_br, iface_to_nss, veth_peers):
         self.devices = devices
         self.ports = ports
         self.os_info = os_info
+        self.linuxnet = linuxnet
         self.linkpairs = linkpairs
         self.port_to_br = port_to_br
         self.iface_to_nss = iface_to_nss