aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhijit Sinha <abhijit.sinha@intel.com>2018-11-01 10:07:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-01 10:07:30 +0000
commit5b77ebed3fd8b4a86a726feedcc3fc42e8855fdb (patch)
tree4a14ffc09b3622c9fe66d1e8e5b7a4299d506f6f
parent6227c1aadbfd6ad6e5dcbb9c53b2fb1020c94e1f (diff)
parent02fac361b705f18be0cbaf1b281e8007f4331daa (diff)
Merge "Fix default IPv4 mask for IxNetwork traffic config" into stable/gambia
-rw-r--r--yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py b/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
index cf625d483..4fbbf706d 100644
--- a/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
+++ b/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
@@ -41,9 +41,6 @@ C_VLAN = 1
ETHER_TYPE_802_1ad = '0x88a8'
-IP_VERSION_4_MASK = 24
-IP_VERSION_6_MASK = 64
-
TRAFFIC_STATUS_STARTED = 'started'
TRAFFIC_STATUS_STOPPED = 'stopped'
@@ -519,8 +516,10 @@ class IxNextgen(object): # pragma: no cover
dstip = str(traffic_param['outer_l3']['dstip'])
srcseed = traffic_param['outer_l3']['srcseed']
dstseed = traffic_param['outer_l3']['dstseed']
- srcmask = traffic_param['outer_l3']['srcmask'] or IP_VERSION_4_MASK
- dstmask = traffic_param['outer_l3']['dstmask'] or IP_VERSION_4_MASK
+ srcmask = traffic_param['outer_l3']['srcmask'] \
+ or ipaddress.IPV4LENGTH
+ dstmask = traffic_param['outer_l3']['dstmask'] \
+ or ipaddress.IPV4LENGTH
self._update_ipv4_address(
self._get_stack_item(fg_id, PROTO_IPV4)[0],