Merge "Fix issues with 'Success_' stats reported by ProxBinSearchProfile"

2 files changed, 127 insertions, 109 deletions

diff --git a/yardstick/network_services/traffic_profile/prox_binsearch.py b/yardstick/network_services/traffic_profile/prox_binsearch.py
index 506a880e0..16a0411ec 100644
--- a/yardstick/network_services/traffic_profile/prox_binsearch.py
+++ b/yardstick/network_services/traffic_profile/prox_binsearch.py
@@ -25,6 +25,14 @@ from yardstick.common import constants as overall_constants
 
 LOG = logging.getLogger(__name__)
 
+STATUS_SUCCESS = "Success"
+STATUS_FAIL = "Failure"
+STATUS_RESULT = "Result"
+STEP_CONFIRM = "Confirm retry"
+STEP_INCREASE_LOWER = "Increase lower"
+STEP_DECREASE_LOWER = "Decrease lower"
+STEP_DECREASE_UPPER = "Decrease upper"
+
 
 class ProxBinSearchProfile(ProxProfile):
     """
@@ -85,18 +93,16 @@ class ProxBinSearchProfile(ProxProfile):
         # success, the binary search will complete on an integer multiple
         # of the precision, rather than on a fraction of it.
 
-        theor_max_thruput = actual_max_thruput = 0
+        theor_max_thruput = 0
 
         result_samples = {}
 
-        # Store one time only value in influxdb
-        single_samples = {
+        test_data = {
             "test_duration": traffic_gen.scenario_helper.scenario_cfg["runner"]["duration"],
             "test_precision": self.params["traffic_profile"]["test_precision"],
             "tolerated_loss": self.params["traffic_profile"]["tolerated_loss"],
             "duration": duration
         }
-        self.queue.put(single_samples)
         self.prev_time = time.time()
 
         # throughput and packet loss from the most recent successful test
@@ -110,85 +116,88 @@ class ProxBinSearchProfile(ProxProfile):
             neg_retry = 0
             total_retry = 0
 
-            LOG.info("Checking MAX %s MIN %s TEST %s",
-                self.current_upper, self.lower_bound, test_value)
+            LOG.info("Checking MAX %s MIN %s TEST %s", self.current_upper,
+                     self.lower_bound, test_value)
+
             while (pos_retry <= ok_retry) and (neg_retry <= ok_retry):
 
                 total_retry = total_retry + 1
+
                 result, port_samples = self._profile_helper.run_test(pkt_size, duration,
                                                                      test_value,
                                                                      self.tolerated_loss,
                                                                      line_speed)
-                if (total_retry > (ok_retry * 3)) and (ok_retry is not 0):
-                    LOG.info("Failure.!! .. RETRY EXCEEDED ... decrease lower bound")
 
+                if (total_retry > (ok_retry * 3)) and (ok_retry is not 0):
+                    status = STATUS_FAIL
+                    next_step = STEP_DECREASE_LOWER
                     successful_pkt_loss = result.pkt_loss
-                    samples = result.get_samples(pkt_size, successful_pkt_loss, port_samples)
-
                     self.current_upper = test_value
                     neg_retry = total_retry
                 elif result.success:
                     if (pos_retry < ok_retry) and (ok_retry is not 0):
-                        neg_retry = 0
-                        LOG.info("Success! ... confirm retry")
-
+                        status = STATUS_SUCCESS
+                        next_step = STEP_CONFIRM
                         successful_pkt_loss = result.pkt_loss
-                        samples = result.get_samples(pkt_size, successful_pkt_loss, port_samples)
-
+                        neg_retry = 0
                     else:
-                        LOG.info("Success! Increasing lower bound")
+                        status = STATUS_SUCCESS
+                        next_step = STEP_INCREASE_LOWER
                         self.current_lower = test_value
-
                         successful_pkt_loss = result.pkt_loss
-                        samples = result.get_samples(pkt_size, successful_pkt_loss, port_samples)
-
-                        # store results with success tag in influxdb
-                        success_samples = \
-                            {'Success_' + key: value for key, value in samples.items()}
-
-                        success_samples["Success_rx_total"] = int(result.rx_total)
-                        success_samples["Success_tx_total"] = int(result.tx_total)
-                        success_samples["Success_can_be_lost"] = int(result.can_be_lost)
-                        success_samples["Success_drop_total"] = int(result.drop_total)
-                        success_samples["Success_RxThroughput"] = samples["RxThroughput"]
-                        success_samples["Success_RxThroughput_gbps"] = \
-                            (samples["RxThroughput"] / 1000) * ((pkt_size + 20)* 8)
-                        LOG.info(">>>##>>Collect SUCCESS TG KPIs %s %s",
-                                 datetime.datetime.now(), success_samples)
-                        self.queue.put(success_samples, True, overall_constants.QUEUE_PUT_TIMEOUT)
-
-                        # Store Actual throughput for result samples
-                        actual_max_thruput = success_samples["Success_RxThroughput"]
 
                     pos_retry = pos_retry + 1
 
                 else:
                     if (neg_retry < ok_retry) and (ok_retry is not 0):
-
+                        status = STATUS_FAIL
+                        next_step = STEP_CONFIRM
                         pos_retry = 0
-                        LOG.info("failure! ... confirm retry")
                     else:
-                        LOG.info("Failure... Decreasing upper bound")
+                        status = STATUS_FAIL
+                        next_step = STEP_DECREASE_UPPER
                         self.current_upper = test_value
 
                     neg_retry = neg_retry + 1
-                    samples = result.get_samples(pkt_size, successful_pkt_loss, port_samples)
+
+                LOG.info(
+                    "Status = '%s' Next_Step = '%s'", status, next_step)
+
+                samples = result.get_samples(pkt_size, successful_pkt_loss, port_samples)
 
                 if theor_max_thruput < samples["TxThroughput"]:
                     theor_max_thruput = samples['TxThroughput']
-                    self.queue.put({'theor_max_throughput': theor_max_thruput})
-
-                LOG.info(">>>##>>Collect TG KPIs %s %s", datetime.datetime.now(), samples)
+                samples['theor_max_throughput'] = theor_max_thruput
+
+                samples["rx_total"] = int(result.rx_total)
+                samples["tx_total"] = int(result.tx_total)
+                samples["can_be_lost"] = int(result.can_be_lost)
+                samples["drop_total"] = int(result.drop_total)
+                samples["RxThroughput_gbps"] = \
+                    (samples["RxThroughput"] / 1000) * ((pkt_size + 20) * 8)
+                samples['Status'] = status
+                samples['Next_Step'] = next_step
                 samples["MAX_Rate"] = self.current_upper
                 samples["MIN_Rate"] = self.current_lower
                 samples["Test_Rate"] = test_value
                 samples["Step_Id"] = step_id
                 samples["Confirmation_Retry"] = total_retry
+
+                samples.update(test_data)
+
+                if status == STATUS_SUCCESS and next_step == STEP_INCREASE_LOWER:
+                    # Store success samples for result samples
+                    result_samples = samples
+
+                LOG.info(">>>##>>Collect TG KPIs %s %s", datetime.datetime.now(), samples)
+
                 self.queue.put(samples, True, overall_constants.QUEUE_PUT_TIMEOUT)
 
-        LOG.info(">>>##>> Result Reached PktSize %s Theor_Max_Thruput %s Actual_throughput %s",
-                 pkt_size, theor_max_thruput, actual_max_thruput)
-        result_samples["Result_pktSize"] = pkt_size
-        result_samples["Result_theor_max_throughput"] = theor_max_thruput
-        result_samples["Result_Actual_throughput"] = actual_max_thruput
+        LOG.info(
+            ">>>##>> Result Reached PktSize %s Theor_Max_Thruput %s Actual_throughput %s",
+            pkt_size, theor_max_thruput, result_samples.get("RxThroughput", 0))
+        result_samples["Status"] = STATUS_RESULT
+        result_samples["Next_Step"] = ""
+        result_samples["Actual_throughput"] = result_samples.get("RxThroughput", 0)
+        result_samples["theor_max_throughput"] = theor_max_thruput
         self.queue.put(result_samples)
diff --git a/yardstick/tests/unit/network_services/traffic_profile/test_prox_binsearch.py b/yardstick/tests/unit/network_services/traffic_profile/test_prox_binsearch.py
index c062308e8..c09903377 100644
--- a/yardstick/tests/unit/network_services/traffic_profile/test_prox_binsearch.py
+++ b/yardstick/tests/unit/network_services/traffic_profile/test_prox_binsearch.py
@@ -71,38 +71,43 @@ class TestProxBinSearchProfile(unittest.TestCase):
         self.assertEqual(len(runs), 77)
 
         # Result Samples inc theor_max
-        result_tuple = {'Result_Actual_throughput': 5e-07,
-                        'Result_theor_max_throughput': 7.5e-07,
-                        'Result_pktSize': 200}
-
-        profile.queue.put.assert_called_with(result_tuple)
-
-        success_result_tuple = {"Success_CurrentDropPackets": 0.5,
-                                "Success_DropPackets": 0.5,
-                                "Success_LatencyAvg": 5.3,
-                                "Success_LatencyMax": 5.2,
-                                "Success_LatencyMin": 5.1,
-                                "Success_PktSize": 200,
-                                "Success_RxThroughput": 7.5e-07,
-                                "Success_Throughput": 7.5e-07,
-                                "Success_TxThroughput": 0.00012340000000000002}
+        result_tuple = {'Actual_throughput': 5e-07,
+                        'theor_max_throughput': 7.5e-07,
+                        'PktSize': 200,
+                        'Status': 'Result'}
+
+        test_results = profile.queue.put.call_args[0]
+        for k in result_tuple:
+            self.assertEqual(result_tuple[k], test_results[0][k])
+
+        success_result_tuple = {"CurrentDropPackets": 0.5,
+                                "DropPackets": 0.5,
+                                "LatencyAvg": 5.3,
+                                "LatencyMax": 5.2,
+                                "LatencyMin": 5.1,
+                                "PktSize": 200,
+                                "RxThroughput": 7.5e-07,
+                                "Throughput": 7.5e-07,
+                                "TxThroughput": 0.00012340000000000002,
+                                "Status": 'Success'}
 
         calls = profile.queue.put(success_result_tuple)
         profile.queue.put.assert_has_calls(calls)
 
-        success_result_tuple2 = {"Success_CurrentDropPackets": 0.5,
-                                "Success_DropPackets": 0.5,
-                                "Success_LatencyAvg": 5.3,
-                                "Success_LatencyMax": 5.2,
-                                "Success_LatencyMin": 5.1,
-                                "Success_PktSize": 200,
-                                "Success_RxThroughput": 7.5e-07,
-                                "Success_Throughput": 7.5e-07,
-                                "Success_TxThroughput": 123.4,
-                                "Success_can_be_lost": 409600,
-                                "Success_drop_total": 20480,
-                                "Success_rx_total": 4075520,
-                                "Success_tx_total": 4096000}
+        success_result_tuple2 = {"CurrentDropPackets": 0.5,
+                                "DropPackets": 0.5,
+                                "LatencyAvg": 5.3,
+                                "LatencyMax": 5.2,
+                                "LatencyMin": 5.1,
+                                "PktSize": 200,
+                                "RxThroughput": 7.5e-07,
+                                "Throughput": 7.5e-07,
+                                "TxThroughput": 123.4,
+                                "can_be_lost": 409600,
+                                "drop_total": 20480,
+                                "rx_total": 4075520,
+                                "tx_total": 4096000,
+                                "Status": 'Success'}
 
         calls = profile.queue.put(success_result_tuple2)
         profile.queue.put.assert_has_calls(calls)
@@ -183,17 +188,16 @@ class TestProxBinSearchProfile(unittest.TestCase):
 
 
         # Result Samples
-        result_tuple = {'Result_Actual_throughput': 0, "Result_theor_max_throughput": 0,
-                        "Result_pktSize": 200}
+        result_tuple = {'Actual_throughput': 0, 'theor_max_throughput': 0,
+                        "Status": 'Result', "Next_Step": ''}
         profile.queue.put.assert_called_with(result_tuple)
 
         # Check for success_ tuple (None expected)
         calls = profile.queue.put.mock_calls
         for call in calls:
             for call_detail in call[1]:
-                for k in call_detail:
-                    if "Success_" in k:
-                        self.assertRaises(AttributeError)
+                if call_detail["Status"] == 'Success':
+                    self.assertRaises(AttributeError)
 
     def test_execute_4(self):
 
@@ -237,38 +241,43 @@ class TestProxBinSearchProfile(unittest.TestCase):
         self.assertEqual(len(runs), 7)
 
         # Result Samples inc theor_max
-        result_tuple = {'Result_Actual_throughput': 5e-07,
-                        'Result_theor_max_throughput': 7.5e-07,
-                        'Result_pktSize': 200}
-
-        profile.queue.put.assert_called_with(result_tuple)
-
-        success_result_tuple = {"Success_CurrentDropPackets": 0.5,
-                                "Success_DropPackets": 0.5,
-                                "Success_LatencyAvg": 5.3,
-                                "Success_LatencyMax": 5.2,
-                                "Success_LatencyMin": 5.1,
-                                "Success_PktSize": 200,
-                                "Success_RxThroughput": 7.5e-07,
-                                "Success_Throughput": 7.5e-07,
-                                "Success_TxThroughput": 0.00012340000000000002}
+        result_tuple = {'Actual_throughput': 5e-07,
+                        'theor_max_throughput': 7.5e-07,
+                        'PktSize': 200,
+                        "Status": 'Result'}
+
+        test_results = profile.queue.put.call_args[0]
+        for k in result_tuple:
+            self.assertEqual(result_tuple[k], test_results[0][k])
+
+        success_result_tuple = {"CurrentDropPackets": 0.5,
+                                "DropPackets": 0.5,
+                                "LatencyAvg": 5.3,
+                                "LatencyMax": 5.2,
+                                "LatencyMin": 5.1,
+                                "PktSize": 200,
+                                "RxThroughput": 7.5e-07,
+                                "Throughput": 7.5e-07,
+                                "TxThroughput": 0.00012340000000000002,
+                                "Status": 'Success'}
 
         calls = profile.queue.put(success_result_tuple)
         profile.queue.put.assert_has_calls(calls)
 
-        success_result_tuple2 = {"Success_CurrentDropPackets": 0.5,
-                                 "Success_DropPackets": 0.5,
-                                 "Success_LatencyAvg": 5.3,
-                                 "Success_LatencyMax": 5.2,
-                                 "Success_LatencyMin": 5.1,
-                                 "Success_PktSize": 200,
-                                 "Success_RxThroughput": 7.5e-07,
-                                 "Success_Throughput": 7.5e-07,
-                                 "Success_TxThroughput": 123.4,
-                                 "Success_can_be_lost": 409600,
-                                 "Success_drop_total": 20480,
-                                 "Success_rx_total": 4075520,
-                                 "Success_tx_total": 4096000}
+        success_result_tuple2 = {"CurrentDropPackets": 0.5,
+                                 "DropPackets": 0.5,
+                                 "LatencyAvg": 5.3,
+                                 "LatencyMax": 5.2,
+                                 "LatencyMin": 5.1,
+                                 "PktSize": 200,
+                                 "RxThroughput": 7.5e-07,
+                                 "Throughput": 7.5e-07,
+                                 "TxThroughput": 123.4,
+                                 "can_be_lost": 409600,
+                                 "drop_total": 20480,
+                                 "rx_total": 4075520,
+                                 "tx_total": 4096000,
+                                 "Status": 'Success'}
 
         calls = profile.queue.put(success_result_tuple2)
         profile.queue.put.assert_has_calls(calls)