summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2017-01-27 08:11:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-27 08:11:16 +0000
commitba2f894bbcc1d303cf5895512ac7eff0524d9d69 (patch)
tree66b12507068cab2c7daa3c71c65e0eee727c3b6c /core
parent56e12cde71d4103e1b657ad3199f2bb9e0a3c8ea (diff)
parent7840b1411369b925013711a421066a83310fe114 (diff)
Merge "pkt_gen: STC - RFC 2889 Address Learning and Caching Support"
Diffstat (limited to 'core')
-rw-r--r--core/results/results_constants.py8
-rw-r--r--core/traffic_controller_rfc2889.py12
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)