diff options
Diffstat (limited to 'yardstick/vTC/apexlake/experimental_framework/benchmarks')
3 files changed, 21 insertions, 3 deletions
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 c85aff5a9..320becae5 100644 --- a/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_benchmark.py +++ b/yardstick/vTC/apexlake/experimental_framework/benchmarks/instantiation_validation_benchmark.py @@ -179,7 +179,12 @@ class InstantiationValidationBenchmark(base.BenchmarkBaseClass): self.params[VLAN_RECEIVER] # An IP address is required for the interface to receive a multicast # flow. The specific address is not important - command += ' 10.254.254.254 up' + command += ' 10.254.254.254 up netmask 255.255.255.248' + common.run_command(command) + + command = "sudo ifconfig " + command += self.interface_name + "." + self.params[VLAN_RECEIVER] + command += " promisc" common.run_command(command) # configure smcroute @@ -193,6 +198,7 @@ class InstantiationValidationBenchmark(base.BenchmarkBaseClass): # run smcroute on the interface command = 'sudo smcroute -d' common.run_command(command) + time.sleep(3) # Start the packet checker current_dir = os.path.dirname(os.path.realpath(__file__)) 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 cbb4121bb..1eab70c67 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 @@ -29,8 +29,14 @@ class InstantiationValidationNoisyNeighborsBenchmark( def __init__(self, name, params): base.InstantiationValidationBenchmark.__init__(self, name, params) + + if common.RELEASE == 'liberty': + temp_name = 'stress_workload_liberty.yaml' + else: + temp_name = 'stress_workload.yaml' + self.template_file = common.get_template_dir() + \ - 'stress_workload.yaml' + temp_name self.stack_name = 'neighbour' self.neighbor_stack_names = list() 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 ee02bcc93..f2a87b2b2 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 @@ -26,8 +26,14 @@ class MultiTenancyThroughputBenchmark(base.RFC2544ThroughputBenchmark): def __init__(self, name, params): base.RFC2544ThroughputBenchmark.__init__(self, name, params) + + if common.RELEASE == 'liberty': + temp_name = 'stress_workload_liberty.yaml' + else: + temp_name = 'stress_workload.yaml' + self.template_file = "{}{}".format(common.get_template_dir(), - 'stress_workload.yaml') + temp_name) self.stack_name = 'neighbour' self.neighbor_stack_names = list() |