diff options
Diffstat (limited to 'yardstick/vTC/apexlake/experimental_framework/benchmarks')
6 files changed, 19 insertions, 16 deletions
diff --git a/yardstick/vTC/apexlake/experimental_framework/benchmarks/benchmark_base_class.py b/yardstick/vTC/apexlake/experimental_framework/benchmarks/benchmark_base_class.py index 756962714..41235635c 100644 --- a/yardstick/vTC/apexlake/experimental_framework/benchmarks/benchmark_base_class.py +++ b/yardstick/vTC/apexlake/experimental_framework/benchmarks/benchmark_base_class.py @@ -44,6 +44,9 @@ class BenchmarkBaseClass(object): def get_name(self): return self.name + def get_params(self): + return self.params + def get_features(self): features = dict() features['description'] = 'Please implement the method ' \ diff --git a/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_benchmark.py b/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_benchmark.py index 29a87f2ee..049912305 100644 --- a/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_benchmark.py +++ b/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_benchmark.py @@ -36,8 +36,9 @@ class InstantiationValidationBenchmark(base.BenchmarkBaseClass): def __init__(self, name, params): base.BenchmarkBaseClass.__init__(self, name, params) - self.base_dir = common.get_base_dir() + \ - fp.EXPERIMENTAL_FRAMEWORK_DIR + fp.DPDK_PKTGEN_DIR + self.base_dir = "{}{}{}".format( + common.get_base_dir(), fp.EXPERIMENTAL_FRAMEWORK_DIR, + fp.DPDK_PKTGEN_DIR) self.results_file = self.base_dir + PACKETS_FILE_NAME self.lua_file = self.base_dir + 'constant_traffic.lua' self.res_dir = '' @@ -143,7 +144,7 @@ class InstantiationValidationBenchmark(base.BenchmarkBaseClass): if self.res_dir: packet_checker_res = \ int(common.get_file_first_line(self.res_dir + - '/packet_checker.res')) + 'packet_checker.res')) pkt_gen_res = int(common.get_file_first_line(self.results_file)) if pkt_gen_res <= packet_checker_res or \ (float(pkt_gen_res - packet_checker_res) / pkt_gen_res) <= 0.1: @@ -158,7 +159,7 @@ class InstantiationValidationBenchmark(base.BenchmarkBaseClass): :return: """ # Kill any other process running from previous failed execution - self.res_dir = os.getcwd() + self.res_dir = common.get_result_dir() pids = self._get_pids() for pid in pids: os.kill(pid, signal.SIGTERM) @@ -192,6 +193,9 @@ class InstantiationValidationBenchmark(base.BenchmarkBaseClass): common.run_command(command) # Start the packet checker + # TODO: Compile "make" the packet sniffer + command = "chmod +x {}".format(self.pkt_checker_command) + common.run_command(command) command = self.pkt_checker_command command += self.interface_name + '.' + self.params[VLAN_RECEIVER] command += ' 128' diff --git a/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_noisy_neighbors_benchmark.py b/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_noisy_neighbors_benchmark.py index 4e3b640d8..9610bc165 100644 --- a/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_noisy_neighbors_benchmark.py +++ b/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_noisy_neighbors_benchmark.py @@ -45,11 +45,11 @@ class InstantiationValidationNoisyNeighborsBenchmark( features['allowed_values'][NUMBER_OF_CORES] = \ ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] features['allowed_values'][AMOUNT_OF_RAM] = \ - ['250M', '1G', '2G', '3G', '4G', '5G', '6G', '7G', '8G', '9G', + ['256M', '1G', '2G', '3G', '4G', '5G', '6G', '7G', '8G', '9G', '10G'] features['default_values'][NUM_OF_NEIGHBORS] = '1' features['default_values'][NUMBER_OF_CORES] = '1' - features['default_values'][AMOUNT_OF_RAM] = '250M' + features['default_values'][AMOUNT_OF_RAM] = '256M' return features def init(self): diff --git a/yardstick/vTC/apexlake/experimental_framework/benchmarks/multi_tenancy_throughput_benchmark.py b/yardstick/vTC/apexlake/experimental_framework/benchmarks/multi_tenancy_throughput_benchmark.py index ba1e0cc81..3182837c5 100644 --- a/yardstick/vTC/apexlake/experimental_framework/benchmarks/multi_tenancy_throughput_benchmark.py +++ b/yardstick/vTC/apexlake/experimental_framework/benchmarks/multi_tenancy_throughput_benchmark.py @@ -40,11 +40,11 @@ class MultiTenancyThroughputBenchmark(base.RFC2544ThroughputBenchmark): features['allowed_values']['number_of_cores'] = \ ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] features['allowed_values']['amount_of_ram'] = \ - ['250M', '1G', '2G', '3G', '4G', '5G', '6G', '7G', '8G', '9G', + ['256M', '1G', '2G', '3G', '4G', '5G', '6G', '7G', '8G', '9G', '10G'] features['default_values']['num_of_neighbours'] = '1' features['default_values']['number_of_cores'] = '1' - features['default_values']['amount_of_ram'] = '250M' + features['default_values']['amount_of_ram'] = '256M' return features def init(self): diff --git a/yardstick/vTC/apexlake/experimental_framework/benchmarks/rfc2544_throughput_benchmark.py b/yardstick/vTC/apexlake/experimental_framework/benchmarks/rfc2544_throughput_benchmark.py index 2ac3ea9c4..e026fa377 100644 --- a/yardstick/vTC/apexlake/experimental_framework/benchmarks/rfc2544_throughput_benchmark.py +++ b/yardstick/vTC/apexlake/experimental_framework/benchmarks/rfc2544_throughput_benchmark.py @@ -1,3 +1,4 @@ + # Copyright (c) 2015 Intel Research and Development Ireland Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -74,9 +75,7 @@ class RFC2544ThroughputBenchmark(benchmark_base_class.BenchmarkBaseClass): to measure the throughput of the workload :return: Results of the testcase (type: dict) """ - ret_val = dict() packet_size = self._extract_packet_size_from_params() - ret_val[PACKET_SIZE] = packet_size # Packetgen management packetgen = dpdk.DpdkPacketGenerator() @@ -93,12 +92,7 @@ class RFC2544ThroughputBenchmark(benchmark_base_class.BenchmarkBaseClass): packetgen.send_traffic() common.LOG.debug('Stop the packet generator') - # Result Collection - results = self._get_results() - for metric_name in results.keys(): - ret_val[metric_name] = results[metric_name] - self._reset_lua_file() - return ret_val + return self._get_results() def _extract_packet_size_from_params(self): """ diff --git a/yardstick/vTC/apexlake/experimental_framework/benchmarks/test_benchmark.py b/yardstick/vTC/apexlake/experimental_framework/benchmarks/test_benchmark.py index d530168da..cbb930d21 100644 --- a/yardstick/vTC/apexlake/experimental_framework/benchmarks/test_benchmark.py +++ b/yardstick/vTC/apexlake/experimental_framework/benchmarks/test_benchmark.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import time from experimental_framework.benchmarks import benchmark_base_class as base @@ -33,4 +34,5 @@ class TestBenchmark(base.BenchmarkBaseClass): return features def run(self): + time.sleep(10) return dict() |