diff options
| author |   Dino Madarang <dinox.madarang@intel.com> | 2017-09-28 18:10:28 +0000 |
|---|---|---|
| committer |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-28 12:46:07 -0700 |
| commit | 64e6d4d5eb38109b22a1fa095ace08b55a054642 (patch) | |
| tree | 0f66ac70ff2f3301869613d78e6485989a6e3c70 /yardstick | |
| parent | 0db868278e13d21998bd677bfc782557d44ab381 (diff) | |
vnf_generic: Fix str object has no attribute items
When an IP range is specified in src_ip/dst_ip like:
src_ip:
- '152.16.100.180-152.16.100.181'
yardstick would return str object has no attribute items error.
This change will return the IP range as is if type is str.
Change-Id: I3b097777f0d85b0600207157bebba18987ea2275
Signed-off-by: Dino Simeon Madarang <dinox.madarang@intel.com>
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/vnf_generic.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py index 450f83f6a..355b69862 100644 --- a/yardstick/benchmark/scenarios/networking/vnf_generic.py +++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py @@ -140,8 +140,15 @@ class NetworkServiceTestCase(base.Scenario): def _get_ip_flow_range(self, ip_start_range): + # IP range is specified as 'x.x.x.x-y.y.y.y' + if isinstance(ip_start_range, six.string_types): + return ip_start_range + node_name, range_or_interface = next(iter(ip_start_range.items()), (None, '0.0.0.0')) - if node_name is not None: + if node_name is None: + # we are manually specifying the range + ip_addr_range = range_or_interface + else: node = self.context_cfg["nodes"].get(node_name, {}) try: # the ip_range is the interface name @@ -163,9 +170,6 @@ class NetworkServiceTestCase(base.Scenario): LOG.warning("Only single IP in range %s", ipaddr) # fall back to single IP range ip_addr_range = ip - else: - # we are manually specifying the range - ip_addr_range = range_or_interface return ip_addr_range def _get_traffic_flow(self): |