diff options
author | user <user@TRAFCLASS-PACKET1.fuel.local> | 2016-03-10 10:10:27 -0500 |
---|---|---|
committer | Jörgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-03-22 13:48:31 +0000 |
commit | 3051e176ebe8391baea4428270fdc10ecf10aec5 (patch) | |
tree | 319270ba970b0c099835e58cf2820f2c1e653f07 /yardstick/vTC/apexlake/experimental_framework/benchmarks/multi_tenancy_throughput_benchmark.py | |
parent | c281ce82f3aa4300cc210969aa70fbdccc3809c6 (diff) |
Bug Fix - Fixes the heat template for noisy neighbours and its deployment
Change-Id: I4c45b204a06a728db276a2e4a5f905f3a34f2de5
Signed-off-by: user <user@TRAFCLASS-PACKET1.fuel.local>
(cherry picked from commit 6b3a3a061aed097fcbc7f0c4dceeabf0f7312122)
Diffstat (limited to 'yardstick/vTC/apexlake/experimental_framework/benchmarks/multi_tenancy_throughput_benchmark.py')
-rw-r--r-- | yardstick/vTC/apexlake/experimental_framework/benchmarks/multi_tenancy_throughput_benchmark.py | 10 |
1 files changed, 10 insertions, 0 deletions
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 3182837c5..ee02bcc93 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 @@ -18,6 +18,10 @@ from experimental_framework.benchmarks import rfc2544_throughput_benchmark \ from experimental_framework import common +NETWORK_NAME = 'network' +SUBNET_NAME = 'subnet' + + class MultiTenancyThroughputBenchmark(base.RFC2544ThroughputBenchmark): def __init__(self, name, params): @@ -35,6 +39,8 @@ class MultiTenancyThroughputBenchmark(base.RFC2544ThroughputBenchmark): features['parameters'].append('num_of_neighbours') features['parameters'].append('amount_of_ram') features['parameters'].append('number_of_cores') + features['parameters'].append(NETWORK_NAME) + features['parameters'].append(SUBNET_NAME) features['allowed_values']['num_of_neighbours'] = \ ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] features['allowed_values']['number_of_cores'] = \ @@ -42,6 +48,8 @@ class MultiTenancyThroughputBenchmark(base.RFC2544ThroughputBenchmark): features['allowed_values']['amount_of_ram'] = \ ['256M', '1G', '2G', '3G', '4G', '5G', '6G', '7G', '8G', '9G', '10G'] + features['default_values'][NETWORK_NAME] = '' + features['default_values'][SUBNET_NAME] = '' features['default_values']['num_of_neighbours'] = '1' features['default_values']['number_of_cores'] = '1' features['default_values']['amount_of_ram'] = '256M' @@ -58,6 +66,8 @@ class MultiTenancyThroughputBenchmark(base.RFC2544ThroughputBenchmark): heat_param = dict() heat_param['cores'] = self.params['number_of_cores'] heat_param['memory'] = self.params['amount_of_ram'] + heat_param['network'] = self.params[NETWORK_NAME] + heat_param['subnet'] = self.params[SUBNET_NAME] for i in range(0, int(self.params['num_of_neighbours'])): stack_name = self.stack_name + str(i) common.DEPLOYMENT_UNIT.deploy_heat_template(self.template_file, |