From 8bffdf8c09100f8a923c37bd9be39a13cbc49862 Mon Sep 17 00:00:00 2001 From: Luc Provoost Date: Mon, 7 Jan 2019 10:41:07 +0100 Subject: Improved image build & packet loss measurements Reworked deploycentos1.sh and deploycentos2.sh which is installing a PROX version that deals with non data plane packet counting for improved packet loss measurements. Fixed some issues with the packer scripts. Change-Id: I64aab09d364ab5abbbc5fc75c73afcbe11fed681 Signed-off-by: Luc Provoost --- VNFs/DPPD-PROX/helper-scripts/openstackrapid/prox_ctrl.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'VNFs/DPPD-PROX/helper-scripts/openstackrapid/prox_ctrl.py') diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/prox_ctrl.py b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/prox_ctrl.py index 059cbf71..70395097 100644 --- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/prox_ctrl.py +++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/prox_ctrl.py @@ -208,16 +208,18 @@ class prox_sock(object): return buckets def core_stats(self, cores, task=0): - rx = tx = drop = tsc = hz = 0 - self._send('core stats %s %s' % (','.join(map(str, cores)), task)) + rx = tx = drop = tsc = hz = rx_non_dp = tx_non_dp = 0 + self._send('dp core stats %s %s' % (','.join(map(str, cores)), task)) for core in cores: stats = self._recv().split(',') rx += int(stats[0]) tx += int(stats[1]) - drop += int(stats[2]) - tsc = int(stats[3]) - hz = int(stats[4]) - return rx, tx, drop, tsc, hz + rx_non_dp += int(stats[2]) + tx_non_dp += int(stats[3]) + drop += int(stats[4]) + tsc = int(stats[5]) + hz = int(stats[6]) + return rx-rx_non_dp, tx-tx_non_dp, drop, tsc, hz def set_random(self, cores, task, offset, mask, length): self._send('set random %s %s %s %s %s' % (','.join(map(str, cores)), task, offset, mask, length)) -- cgit 1.2.3-korg