diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/component_factory.py | 4 | ||||
| -rwxr-xr-x | core/loader/loader.py | 6 | ||||
| -rw-r--r-- | core/loader/loader_servant.py | 7 | ||||
| -rw-r--r-- | core/results/results_constants.py | 8 | ||||
| -rw-r--r-- | core/traffic_controller_rfc2889.py | 12 | ||||
| -rw-r--r-- | core/vnf_controller.py | 8 |
6 files changed, 24 insertions, 21 deletions
diff --git a/core/component_factory.py b/core/component_factory.py index 236a61ed..0256b85c 100644 --- a/core/component_factory.py +++ b/core/component_factory.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Intel Corporation. +# Copyright 2015-2017 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -68,6 +68,7 @@ def create_vswitch(deployment_scenario, vswitch_class, traffic, :param tunnel_operation encapsulation/decapsulation or None :return: IVSwitchController for the deployment_scenario """ + # pylint: disable=too-many-return-statements deployment_scenario = deployment_scenario.lower() if deployment_scenario.startswith("p2p"): return VswitchControllerP2P(vswitch_class, traffic) @@ -124,6 +125,7 @@ def create_loadgen(loadgen_type, loadgen_cfg): :param loadgen_class: Reference to load generator class to be used. :return: A new ILoadGenerator class """ + # pylint: disable=too-many-function-args loadgen_type = loadgen_type.lower() if loadgen_type.find("dummy") >= 0: return DummyLoadGen(loadgen_cfg) diff --git a/core/loader/loader.py b/core/loader/loader.py index 0d9c83a6..b0990fa7 100755 --- a/core/loader/loader.py +++ b/core/loader/loader.py @@ -1,4 +1,4 @@ -# Copyright 2015 Intel Corporation. +# Copyright 2015-2017 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ from conf import settings from core.loader.loader_servant import LoaderServant -from tools.pkt_gen.trafficgen import ITrafficGenerator from tools.collectors.collector import ICollector +from tools.pkt_fwd.pkt_fwd import IPktFwd +from tools.pkt_gen.trafficgen import ITrafficGenerator from vswitches.vswitch import IVSwitch from vnfs.vnf.vnf import IVnf -from tools.pkt_fwd.pkt_fwd import IPktFwd class Loader(object): """Loader class - main object context holder. diff --git a/core/loader/loader_servant.py b/core/loader/loader_servant.py index 226b0931..8bad9ab9 100644 --- a/core/loader/loader_servant.py +++ b/core/loader/loader_servant.py @@ -1,4 +1,4 @@ -# Copyright 2015 Intel Corporation. +# Copyright 2015-2017 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -86,7 +86,8 @@ class LoaderServant(object): interface=self._interface) results = [] - for (name, mod) in list(out.items()): + # sort modules to produce the same output everytime + for (name, mod) in sorted(out.items()): desc = (mod.__doc__ or 'No description').strip().split('\n')[0] results.append((name, desc)) @@ -142,7 +143,7 @@ class LoaderServant(object): # find all classes derived from given interface, but suppress # interface itself and any abstract class starting with iface name gens = dict((k, v) for (k, v) in list(mod.__dict__.items()) - if type(v) == type and + if isinstance(v, type) and issubclass(v, interface) and not k.startswith(interface.__name__)) if gens: 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) diff --git a/core/vnf_controller.py b/core/vnf_controller.py index 937cd5cc..78a29258 100644 --- a/core/vnf_controller.py +++ b/core/vnf_controller.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Intel Corporation. +# Copyright 2015-2017 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -67,10 +67,10 @@ class VnfController(object): # enforce that GUEST_NIC_NR is 1 or even number of NICs updated = False nics_nr = settings.getValue('GUEST_NICS_NR') - for index in range(len(nics_nr)): - if nics_nr[index] > 1 and nics_nr[index] % 2: + for index, value in enumerate(nics_nr): + if value > 1 and value % 2: updated = True - nics_nr[index] = int(nics_nr[index] / 2) * 2 + nics_nr[index] = int(value / 2) * 2 if updated: settings.setValue('GUEST_NICS_NR', nics_nr) self._logger.warning('Odd number of NICs was detected. Configuration ' |