diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-11-10 15:09:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-10 15:09:57 +0000 |
| commit | 349660091288e47c3c5032e6dec9d29e9a2f251f (patch) | |
| tree | 726cd008c12bea98511ad661dc038d80b0011369 | |
| parent | af3e090dfcf2448d828308ca83ee79fdbd386245 (diff) | |
| parent | 6b23e3e84eacdd6caa6fe4a93ed9ee1112938e51 (diff) | |
Merge "Remove network_services.vnf_generic.vnf.prox_helpers.ProxSocketHelper.rx_stats"
| -rw-r--r-- | tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py | 14 | ||||
| -rw-r--r-- | yardstick/network_services/vnf_generic/vnf/prox_helpers.py | 5 |
2 files changed, 0 insertions, 19 deletions
diff --git a/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py b/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py index a04698d68..84eb5dc0d 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py @@ -534,20 +534,6 @@ class TestProxSocketHelper(unittest.TestCase): result = prox.hz() self.assertEqual(result, expected) - def test_rx_stats(self, mock_time): - core_stats = [ - '3,4,5,6', - '7,8,9,10,NaN', - '11,12,13,14,15', - ] - - mock_socket = mock.MagicMock() - prox = ProxSocketHelper(mock_socket) - prox.get_data = mock.MagicMock(side_effect=core_stats) - expected = 21, 24, 27, 14 - result = prox.rx_stats([3, 4, 5], 16) - self.assertEqual(result, expected) - def test_core_stats(self, mock_time): core_stats = [ '3,4,5,6', diff --git a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py index d9acae2f2..ba066333d 100644 --- a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py +++ b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py @@ -509,11 +509,6 @@ class ProxSocketHelper(object): def hz(self): return self.get_all_tot_stats()[3] - # Deprecated - # TODO: remove - def rx_stats(self, cores, task=0): - return self.core_stats(cores, task) - def core_stats(self, cores, task=0): """Get the receive statistics from the remote system""" rx = tx = drop = tsc = 0 |