From 9c188cc61a20ff3fff0a640c2cbc65814c0f9274 Mon Sep 17 00:00:00 2001
From: Kun Huang <gareth@openstacker.org>
Date: Thu, 29 Oct 2015 16:21:39 +0800
Subject: [PATCH] parse device traffic like rpc

Change-Id: Ifc2aa017b45f41052fecc80c49fd239b621e6aee
---
 scalpels/agents/base.py         | 10 ++++++++--
 scripts/device-input-traffic.sh |  3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scalpels/agents/base.py b/scalpels/agents/base.py
index f8c2150..97c6d05 100644
--- a/scalpels/agents/base.py
+++ b/scalpels/agents/base.py
@@ -14,7 +14,7 @@ def run_agent(task_uuid, ag):
     ag = subprocess.Popen(cmd.split())
     return ag.pid
 
-def parse_rpc(out):
+def _parse_traffic(out, name):
     """
     in:
         ts, 123.00 pkts  2312 bytes
@@ -29,7 +29,7 @@ def parse_rpc(out):
         unit: bytes
         data: [(ts, 2312.00), ...]
     """
-    ag_name = "Port Traffic"
+    ag_name = "%s Traffic" % name
     pkts_ret = {"name": ag_name,
                 "unit": "pkts",
                 "data":[]}
@@ -42,3 +42,9 @@ def parse_rpc(out):
         bytes_ret["data"].append((ts, bytes))
 
     return (pkts_ret, bytes_ret)
+
+def parse_rpc(out):
+    return _parse_traffic(out, "Port")
+
+def parse_traffic(out):
+    return _parse_traffic(out, "Device")
diff --git a/scripts/device-input-traffic.sh b/scripts/device-input-traffic.sh
index 964d69c..f057c75 100755
--- a/scripts/device-input-traffic.sh
+++ b/scripts/device-input-traffic.sh
@@ -13,8 +13,7 @@ while [ 1 -eq 1 ]  ; do
     sleep $interval
     n_packages=`cat /sys/class/net/$dev/statistics/rx_packets `
     n_bytes=`cat /sys/class/net/$dev/statistics/rx_bytes `
-    python -c "print '%0.2f pkt/s' % (float($n_packages-$packages)/int($interval))"
-    python -c "print '%0.2f byte/s' % (float($n_bytes-$bytes)/int($interval))"
+    python -c "print '%0.2f pkt/s %0.2f byte/s' % ((float($n_packages-$packages)/int($interval), (float($n_bytes-$bytes)/int($interval))))"
     packages=$n_packages
     bytes=$n_bytes
 done