3 files changed, 59 insertions, 8 deletions

diff --git a/yardstick/network_services/traffic_profile/__init__.py b/yardstick/network_services/traffic_profile/__init__.py
index c5d8eff0b..85b3d54a0 100644
--- a/yardstick/network_services/traffic_profile/__init__.py
+++ b/yardstick/network_services/traffic_profile/__init__.py
@@ -31,6 +31,7 @@ def register_modules():
         'yardstick.network_services.traffic_profile.pktgen',
         'yardstick.network_services.traffic_profile.landslide_profile',
         'yardstick.network_services.traffic_profile.vpp_rfc2544',
+        'yardstick.network_services.traffic_profile.sip',
     ]
 
     for module in modules:
diff --git a/yardstick/network_services/traffic_profile/sip.py b/yardstick/network_services/traffic_profile/sip.py
new file mode 100644
index 000000000..d18574090
--- /dev/null
+++ b/yardstick/network_services/traffic_profile/sip.py
@@ -0,0 +1,32 @@
+# Copyright (c) 2019 Viosoft Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from yardstick.network_services.traffic_profile import base
+
+
+class SipProfile(base.TrafficProfile):
+    """ Sipp Traffic profile """
+
+    def __init__(self, yaml_data):
+        super(SipProfile, self).__init__(yaml_data)
+        self.generator = None
+
+    def execute_traffic(self, traffic_generator=None):
+        if traffic_generator is not None and self.generator is None:
+            self.generator = traffic_generator
+
+    def is_ended(self):
+        if self.generator is not None:
+            return self.generator.is_ended()
+        return False
diff --git a/yardstick/network_services/traffic_profile/vpp_rfc2544.py b/yardstick/network_services/traffic_profile/vpp_rfc2544.py
index 0f8185f90..412e4e69a 100644
--- a/yardstick/network_services/traffic_profile/vpp_rfc2544.py
+++ b/yardstick/network_services/traffic_profile/vpp_rfc2544.py
@@ -13,17 +13,19 @@
 # limitations under the License.
 
 import datetime
+import ipaddress
 import logging
-from random import choice
-from string import ascii_letters
+import random
+import string
 
-from ipaddress import ip_address
 from trex_stl_lib import api as Pkt
 from trex_stl_lib import trex_stl_client
 from trex_stl_lib import trex_stl_packet_builder_scapy
 from trex_stl_lib import trex_stl_streams
 
 from yardstick.common import constants
+from yardstick.network_services.helpers.vpp_helpers.multiple_loss_ratio_search import \
+    MultipleLossRatioSearch
 from yardstick.network_services.traffic_profile.rfc2544 import RFC2544Profile, \
     PortPgIDMap
 from yardstick.network_services.traffic_profile.trex_traffic_profile import IP, \
@@ -37,6 +39,10 @@ class VppRFC2544Profile(RFC2544Profile):
     def __init__(self, traffic_generator):
         super(VppRFC2544Profile, self).__init__(traffic_generator)
 
+        tp_cfg = traffic_generator["traffic_profile"]
+        self.number_of_intermediate_phases = tp_cfg.get("intermediate_phases",
+                                                        2)
+
         self.duration = self.config.duration
         self.precision = self.config.test_precision
         self.lower_bound = self.config.lower_bound
@@ -85,7 +91,7 @@ class VppRFC2544Profile(RFC2544Profile):
     def _gen_payload(length):
         payload = ""
         for _ in range(length):
-            payload += choice(ascii_letters)
+            payload += random.choice(string.ascii_letters)
 
         return payload
 
@@ -153,8 +159,9 @@ class VppRFC2544Profile(RFC2544Profile):
                                 dst=dst_start_ip,
                                 proto=outer_l3v4['proto'])
         if self.flow > 1:
-            dst_start_int = int(ip_address(str(dst_start_ip)))
-            dst_end_ip_new = ip_address(dst_start_int + self.flow - 1)
+            dst_start_int = int(ipaddress.ip_address(str(dst_start_ip)))
+            dst_end_ip_new = ipaddress.ip_address(
+                dst_start_int + self.flow - 1)
             # self._set_proto_addr(IP, SRC, outer_l3v4['srcip4'], outer_l3v4['count'])
             self._set_proto_addr(IP, DST,
                                  "{start_ip}-{end_ip}".format(
@@ -248,8 +255,19 @@ class VppRFC2544Profile(RFC2544Profile):
 
     def binary_search_with_optimized(self, traffic_generator, duration,
                                      timeout, test_data):
-        # TODO Support FD.io Multiple Loss Ratio search (MLRsearch)
-        pass
+        self.queue.cancel_join_thread()
+        algorithm = MultipleLossRatioSearch(
+            measurer=traffic_generator, latency=self.enable_latency,
+            pkt_size=self.pkt_size,
+            final_trial_duration=duration,
+            final_relative_width=self.step_interval / 100,
+            number_of_intermediate_phases=self.number_of_intermediate_phases,
+            initial_trial_duration=1,
+            timeout=timeout)
+        algorithm.init_generator(self.ports, self.port_pg_id, self.profiles,
+                                 test_data, self.queue)
+        return algorithm.narrow_down_ndr_and_pdr(10000, self.max_rate,
+                                                 self.tolerance_high)
 
     def binary_search(self, traffic_generator, duration, tolerance_value,
                       test_data):