IPV6 testing & minor changes and fixes

IPV6 test has been added. The generator will now generate IPV6 packets
using NDP to resolve MAC addresses. The hex IP addresses in the inline
definition of the packets in the cfg files is now calculated by a lua
function called in parameters.lua. The hard-coded path /home/centos has
been replaced by ~. An error in the speed calculations has been fixed.
See the RapidTest class for details. The actual number of generated
flows is now reported. If the requested number of flows is not a power
of 2, the lowest power of 2 that is larger than the requested number of
flows will be used and reported.

Change-Id: I36b8d345b4a03c2cf358c19ec353ca8ad2831293
Signed-off-by: Luc Provoost <luc.provoost@intel.com>

1 files changed, 16 insertions, 4 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_test.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_test.py
index 2466d89b..b39520c7 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_test.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_test.py
@@ -29,22 +29,34 @@ class RapidTest(object):
     @staticmethod
     def get_percentageof10Gbps(pps_speed,size):
         # speed is given in pps, returning % of 10Gb/s
-        return (pps_speed / 1000000.0 * 0.08 * (size+28))
+        # 12 bytes is the inter packet gap 
+        # pre-amble is 7 bytes
+        # SFD (start of frame delimiter) is 1 byte
+        # Total of 20 bytes overhead per packet
+        return (pps_speed / 1000000.0 * 0.08 * (size+20))
 
     @staticmethod
     def get_pps(speed,size):
         # speed is given in % of 10Gb/s, returning Mpps
-        return (speed * 100.0 / (8*(size+28)))
+        # 12 bytes is the inter packet gap 
+        # pre-amble is 7 bytes
+        # SFD (start of frame delimiter) is 1 byte
+        # Total of 20 bytes overhead per packet
+        return (speed * 100.0 / (8*(size+20)))
 
     @staticmethod
     def get_speed(packet_speed,size):
         # return speed in Gb/s
-        return (packet_speed / 1000.0 * (8*(size+28)))
+        # 12 bytes is the inter packet gap 
+        # pre-amble is 7 bytes
+        # SFD (start of frame delimiter) is 1 byte
+        # Total of 20 bytes overhead per packet
+        return (packet_speed / 1000.0 * (8*(size+20)))
 
     @staticmethod
     def set_background_flows(background_machines, number_of_flows):
         for machine in background_machines:
-            machine.set_flows(number_of_flows)
+            _ = machine.set_flows(number_of_flows)
 
     @staticmethod
     def set_background_speed(background_machines, speed):