Merge "trex_learning: Add learning packet option to T-Rex testing"

[vswitchperf.git] / tools / pkt_gen / testcenter / testcenter.py

diff --git a/tools/pkt_gen/testcenter/testcenter.py b/tools/pkt_gen/testcenter/testcenter.py
index 4412b13..9980ae7 100644 (file)
--- a/tools/pkt_gen/testcenter/testcenter.py
+++ b/tools/pkt_gen/testcenter/testcenter.py
@@ -246,6 +246,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
                     row["ForwardingRate(fps)"])
         return result
 
+    # pylint: disable=unused-argument
     def send_rfc2889_forwarding(self, traffic=None, tests=1, duration=20):
         """
         Send traffic per RFC2889 Forwarding test specifications.
@@ -384,7 +385,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
         rfc2544_common_args = get_rfc2544_common_settings()
         rfc2544_custom_args = get_rfc2544_custom_settings(framesize,
                                                           custom, 1)
-        args = stc_common_args + rfc2544_common_args + rfc2544_custom_args
+        args = rfc2544_common_args + stc_common_args + rfc2544_custom_args
 
         if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
             args.append("--verbose")
@@ -417,7 +418,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
         rfc2544_common_args = get_rfc2544_common_settings()
         rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '',
                                                           tests)
-        args = stc_common_args + rfc2544_common_args + rfc2544_custom_args
+        args = rfc2544_common_args + stc_common_args + rfc2544_custom_args
 
         if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
             args.append("--verbose")
@@ -450,7 +451,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
         rfc2544_common_args = get_rfc2544_common_settings()
         rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '',
                                                           tests)
-        args = stc_common_args + rfc2544_common_args + rfc2544_custom_args
+        args = rfc2544_common_args + stc_common_args + rfc2544_custom_args
 
         if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
             args.append("--verbose")
@@ -467,6 +468,26 @@ class TestCenter(trafficgen.ITrafficGenerator):
 
         return self.get_rfc2544_results(filecs)
 
+    def start_cont_traffic(self, traffic=None, duration=30):
+        raise NotImplementedError('TestCenter start_cont_traffic not implement.')
+
+    def stop_cont_traffic(self):
+        raise NotImplementedError('TestCenter stop_cont_traffic not implement.')
+
+    def start_rfc2544_back2back(self, traffic=None, tests=1, duration=20,
+                                lossrate=0.0):
+        raise NotImplementedError('TestCenter start_rfc2544_back2back not implement.')
+
+    def wait_rfc2544_back2back(self):
+        raise NotImplementedError('TestCenter wait_rfc2544_back2back not implement.')
+
+    def start_rfc2544_throughput(self, traffic=None, tests=1, duration=20,
+                                 lossrate=0.0):
+        raise NotImplementedError('TestCenter start_rfc2544_throughput not implement.')
+
+    def wait_rfc2544_throughput(self):
+        raise NotImplementedError('TestCenter wait_rfc2544_throughput not implement.')
+
 if __name__ == '__main__':
     TRAFFIC = {
         'l3': {