Merge "Bugfix: pylint fix for yardstick/orchestrator/heat.py (no-value-for-parameter)"

[yardstick.git] / yardstick / network_services / traffic_profile / ixia_rfc2544.py

diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
index c32e9d8..26dc1fe 100644 (file)
--- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py
+++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
@@ -42,6 +42,13 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
         mask = utils.get_mask_from_ip_range(_ip_range[0], _ip_range[1])
         return _ip_range[0], mask
 
+    def _get_fixed_and_mask(self, port_range):
+        _port_range = str(port_range).split('-')
+        if len(_port_range) == 1:
+            return int(_port_range[0]), 0
+
+        return int(_port_range[0]), int(_port_range[1])
+
     def _get_ixia_traffic_profile(self, profile_data, mac=None):
         mac = {} if mac is None else mac
         result = {}
@@ -70,6 +77,9 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
                 srcip, srcmask = self._get_ip_and_mask(ip[src_key])
                 dstip, dstmask = self._get_ip_and_mask(ip[dst_key])
 
+                outer_l4 = value.get('outer_l4')
+                src_port, src_port_mask = self._get_fixed_and_mask(outer_l4['srcport'])
+                dst_port, dst_port_mask = self._get_fixed_and_mask(outer_l4['dstport'])
                 result[traffickey] = {
                     'bidir': False,
                     'id': port_id,
@@ -78,6 +88,7 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
                     'outer_l2': {
                         'framesize': value['outer_l2']['framesize'],
                         'framesPerSecond': True,
+                        'QinQ': value['outer_l2'].get('QinQ'),
                         'srcmac': mac['src_mac_{}'.format(port_index)],
                         'dstmac': mac['dst_mac_{}'.format(port_index)],
                     },
@@ -85,6 +96,7 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
                         'count': ip['count'],
                         'dscp': ip['dscp'],
                         'ttl': ip['ttl'],
+                        'seed': ip['seed'],
                         'srcip': srcip,
                         'dstip': dstip,
                         'srcmask': srcmask,
@@ -92,7 +104,15 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
                         'type': key,
                         'proto': ip['proto'],
                     },
-                    'outer_l4': value['outer_l4'],
+                    'outer_l4': {
+                        'srcport': src_port,
+                        'dstport': dst_port,
+                        'srcportmask': src_port_mask,
+                        'dstportmask': dst_port_mask,
+                        'count': outer_l4['count'],
+                        'seed': outer_l4['seed'],
+                    }
+
                 }
             except KeyError:
                 continue
@@ -100,8 +120,9 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
         return result
 
     def _ixia_traffic_generate(self, traffic, ixia_obj):
-        ixia_obj.update_frame(traffic)
+        ixia_obj.update_frame(traffic, self.config.duration)
         ixia_obj.update_ip_packet(traffic)
+        ixia_obj.update_l4(traffic)
         ixia_obj.start_traffic()
 
     def update_traffic_profile(self, traffic_generator):
@@ -137,11 +158,12 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
         self._ixia_traffic_generate(traffic, ixia_obj)
         return first_run
 
-    def get_drop_percentage(self, samples, tol_min, tolerance, duration=30.0,
+    def get_drop_percentage(self, samples, tol_min, tolerance,
                             first_run=False):
         completed = False
         drop_percent = 100
         num_ifaces = len(samples)
+        duration = self.config.duration
         in_packets_sum = sum(
             [samples[iface]['in_packets'] for iface in samples])
         out_packets_sum = sum(
@@ -169,7 +191,7 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
             completed = True if drop_percent <= tolerance else False
         if (first_run and
                 self.rate_unit == tp_base.TrafficProfileConfig.RATE_FPS):
-            self.rate = out_packets_sum / duration / num_ifaces
+            self.rate = float(out_packets_sum) / duration / num_ifaces
 
         if drop_percent > tolerance:
             self.max_rate = self.rate