diff options
| author |   Abhijit Sinha <abhijit.sinha@intel.com> | 2018-11-05 12:03:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-05 12:03:58 +0000 |
| commit | e13f82dc70084480611bab5aa04ac126c0b1ff0e (patch) | |
| tree | 3cb2748d7fc5a47892e68276212f46102a24a72d /yardstick/benchmark/scenarios | |
| parent | 9d4930bdfb80437a3149b080f195416814a44b75 (diff) | |
| parent | 383c438cda94a1004bc9552a5993fe3ff3e6da8f (diff) | |
Merge "Test case override of traffic profile settings."
Diffstat (limited to 'yardstick/benchmark/scenarios')
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/vnf_generic.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py index 20fff61ed..d8f062522 100644 --- a/yardstick/benchmark/scenarios/networking/vnf_generic.py +++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py @@ -161,8 +161,17 @@ class NetworkServiceTestCase(scenario_base.Scenario): tprofile_base.TrafficProfile.DOWNLINK: {}, 'extra_args': extra_args, 'duration': self._get_duration()} + traffic_vnfd = vnfdgen.generate_vnfd(tprofile, tprofile_data) - self.traffic_profile = tprofile_base.TrafficProfile.get(traffic_vnfd) + + traffic_config = \ + self.scenario_cfg.get("options", {}).get("traffic_config", {}) + + traffic_vnfd.setdefault("traffic_profile", {}) + traffic_vnfd["traffic_profile"].update(traffic_config) + + self.traffic_profile = \ + tprofile_base.TrafficProfile.get(traffic_vnfd) def _get_topology(self): topology = self.scenario_cfg["topology"] |