diff options
| author |   Sridhar K. N. Rao <sridhar.rao@spirent.com> | 2017-01-25 15:36:25 +0530 |
|---|---|---|
| committer |   Martin Klozik <martinx.klozik@intel.com> | 2017-01-27 08:02:34 +0000 |
| commit | 7840b1411369b925013711a421066a83310fe114 (patch) | |
| tree | 96e590f302a0341e8393c858f565f4af0c704be1 /core | |
| parent | 5c0a56da1e337d70bb26dec3a0bf6bad5aff497f (diff) | |
pkt_gen: STC - RFC 2889 Address Learning and Caching Support
This patch adds RFC-2889 address-learning-rate test and
address-caching-capacity tests. The patch includes following changes
1. 01_testcases.conf: testcase definitions are added for new tests
2. results_constants.py: 3 new results constants are added, removed
unsupported constants
3. testcenter-rfc2889-rest.py: Added support to these two new
tests. Removed un-necessary synchronization of db-file. 5 new
configuration parameters are added - which are explained in (4).
4. trafficgen.rst: Configuration description for rfc2889 tests are
added. Stale information is removed.
5. testcenter.py: Support for two new tests are added. Separate
functions for results analysis and parameter settings are added.
6. traffic_controller_rfc2889.py: Calls to functions in testcenter.py,
based on the traffic_type, are added.
Removed trailing whitespaces from trafficgen.rst
JIRA: VSPERF-395
Change-Id: Ie6ca87519b7736e7410d7f0e60904579934af24a
Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/results/results_constants.py | 8 | ||||
| -rw-r--r-- | core/traffic_controller_rfc2889.py | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/core/results/results_constants.py b/core/results/results_constants.py index 864712bc..2c733fe4 100644 --- a/core/results/results_constants.py +++ b/core/results/results_constants.py @@ -58,11 +58,11 @@ class ResultsConstants(object): SCAL_STREAM_COUNT = 'stream_count' SCAL_STREAM_TYPE = 'match_type' SCAL_PRE_INSTALLED_FLOWS = 'pre-installed_flows' - # RFC2889 Forwarding, Address-Caching and Congestion + # RFC2889 Forwarding, Address-Caching and Address-Learning FORWARDING_RATE_FPS = 'forwarding_rate_fps' - ADDRS_COUNT_FLOOD_COUNT_RATIO = 'addrs_count_flood_count_ratio' - CONGESTION_CONTROL_EXISTS = 'congestion_control_exists' - PORTS_MAP = 'ports_map' + CACHING_CAPACITY_ADDRS = 'caching_capacity_addrs' + ADDR_LEARNED_PERCENT = 'addr_learned_percent' + OPTIMAL_LEARNING_RATE_FPS = 'optimal_learning_rate_fps' TEST_RUN_TIME = "test_execution_time" diff --git a/core/traffic_controller_rfc2889.py b/core/traffic_controller_rfc2889.py index 210d5f5f..05955e65 100644 --- a/core/traffic_controller_rfc2889.py +++ b/core/traffic_controller_rfc2889.py @@ -50,13 +50,13 @@ class TrafficControllerRFC2889(TrafficController, IResults): else: traffic['l2'] = {'framesize': packet_size} - if traffic['traffic_type'] == 'caching': + if traffic['traffic_type'] == 'rfc2889_caching': result = self._traffic_gen_class.send_rfc2889_caching( - traffic, trials=self._trials, duration=self._duration) - elif traffic['traffic_type'] == 'congestion': - result = self._traffic_gen_class.send_rfc2889_congestion( - traffic, duration=self._duration) - else: + traffic, tests=self._trials, duration=self._duration) + elif traffic['traffic_type'] == 'rfc2889_learning': + result = self._traffic_gen_class.send_rfc2889_learning( + traffic, tests=self._trials, duration=self._duration) + elif traffic['traffic_type'] == 'rfc2889_forwarding': result = self._traffic_gen_class.send_rfc2889_forwarding( traffic, tests=self._trials, duration=self._duration) |