aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-08-30 16:13:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-30 16:13:07 +0000
commit7373f7063e234714fc14e1c59b1b24d018e632c0 (patch)
treee102c11758fdfea9d756b4daeb08a791357691e3
parent4e2e9ebce2eb642480af80cdb63d442dfb81cd04 (diff)
parent5dad388ef2822a6d10b06cf724a3270741c6af2c (diff)
Merge "Add source and destination seed value in IXIA RFC2544"
-rw-r--r--samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml12
-rw-r--r--samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_cgnapt.yaml12
-rw-r--r--samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml12
-rw-r--r--yardstick/benchmark/scenarios/networking/vnf_generic.py7
-rw-r--r--yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py7
-rw-r--r--yardstick/network_services/traffic_profile/ixia_rfc2544.py3
-rw-r--r--yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py6
7 files changed, 39 insertions, 20 deletions
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
index 906793740..f71c08861 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
@@ -53,7 +53,8 @@ uplink_0:
srcip4: "{{get(flow, 'flow.src_ip_0', '1.1.1.1-1.15.255.255') }}"
dstip4: "{{get(flow, 'flow.dst_ip_0', '90.90.1.1-90.105.255.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 0
outer_l4:
@@ -86,7 +87,8 @@ downlink_0:
dstip4: "{{get(flow, 'flow.public_ip_0', '90.90.1.1-90.105.255.255') }}"
{% endif %}
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 0
outer_l4:
@@ -116,7 +118,8 @@ uplink_1:
srcip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.15.255.255') }}"
dstip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.105.255.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 0
outer_l4:
@@ -149,7 +152,8 @@ downlink_1:
dstip4: "{{get(flow, 'flow.public_ip_1', '90.90.1.1-90.105.255.255') }}"
{% endif %}
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 0
outer_l4:
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_cgnapt.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_cgnapt.yaml
index 6e2f8ec7c..9e8f67216 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_cgnapt.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_cgnapt.yaml
@@ -51,7 +51,8 @@ uplink_0:
srcip4: "{{get(flow, 'flow.src_ip_0', '1.1.1.1-1.15.255.255') }}"
dstip4: "{{get(flow, 'flow.dst_ip_0', '90.90.1.1-90.105.255.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 0
outer_l4:
@@ -79,7 +80,8 @@ downlink_0:
srcip4: "{{get(flow, 'flow.dst_ip_0', '1.1.1.1-1.15.255.255') }}"
dstip4: "{{get(flow, 'flow.public_ip_0', '10.0.2.1-10.0.2.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 0
outer_l4:
@@ -107,7 +109,8 @@ uplink_1:
srcip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.15.255.255') }}"
dstip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.105.255.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 0
outer_l4:
@@ -135,7 +138,8 @@ downlink_1:
srcip4: "{{get(flow, 'flow.dst_ip_1', '1.1.1.1-1.15.255.255') }}"
dstip4: "{{get(flow, 'flow.public_ip_1', '10.0.2.1-10.0.2.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 0
outer_l4:
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
index cfc5f1ea3..7942fbf4d 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
@@ -73,7 +73,8 @@ uplink_0:
srcip4: "{{get(flow, 'flow.src_ip_0', '192.168.0.0-192.168.255.255') }}"
dstip4: "{{get(flow, 'flow.dst_ip_0', '192.16.0.0-192.16.0.31') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 32
@@ -100,7 +101,8 @@ downlink_0:
srcip4: "{{get(flow, 'flow.dst_ip_0', '192.16.0.0-192.16.0.31') }}"
dstip4: "{{get(flow, 'flow.src_ip_0', '192.168.0.0-192.168.255.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 32
@@ -137,7 +139,8 @@ uplink_1:
srcip4: "{{get(flow, 'flow.srcip_1', '192.168.0.0-192.168.255.255') }}"
dstip4: "{{get(flow, 'flow.dstip_1', '192.16.0.0-192.16.0.31') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 32
@@ -164,7 +167,8 @@ downlink_1:
srcip4: "{{get(flow, 'flow.dst_ip_1', '192.16.0.0-192.16.0.31') }}"
dstip4: "{{get(flow, 'flow.src_ip_1', '192.168.0.0-192.168.255.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
- seed: "{{get(flow, 'flow.seed', '1') }}"
+ srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+ dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
ttl: 32
dscp: 32
diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py
index 4884e57a8..6d68c5e64 100644
--- a/yardstick/benchmark/scenarios/networking/vnf_generic.py
+++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py
@@ -120,8 +120,11 @@ class NetworkServiceTestCase(scenario_base.Scenario):
if "count" in fflow:
flow["count"] = fflow["count"]
- if "seed" in fflow:
- flow["seed"] = fflow["seed"]
+ if "srcseed" in fflow:
+ flow["srcseed"] = fflow["srcseed"]
+
+ if "dstseed" in fflow:
+ flow["dstseed"] = fflow["dstseed"]
except KeyError:
flow = {}
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 8274ff9ce..29533808c 100644
--- a/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
+++ b/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
@@ -477,16 +477,17 @@ class IxNextgen(object): # pragma: no cover
count = traffic_param['outer_l3']['count']
srcip = str(traffic_param['outer_l3']['srcip'])
dstip = str(traffic_param['outer_l3']['dstip'])
- seed = traffic_param['outer_l3']['seed']
+ 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
self._update_ipv4_address(
self._get_stack_item(fg_id, PROTO_IPV4)[0],
- 'srcIp', srcip, seed, srcmask, count)
+ 'srcIp', srcip, srcseed, srcmask, count)
self._update_ipv4_address(
self._get_stack_item(fg_id, PROTO_IPV4)[0],
- 'dstIp', dstip, seed, dstmask, count)
+ 'dstIp', dstip, dstseed, dstmask, count)
def update_l4(self, traffic):
"""Update the L4 headers
diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
index 461604fb8..44bf2eafc 100644
--- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py
+++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
@@ -96,7 +96,8 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
'count': ip['count'],
'dscp': ip['dscp'],
'ttl': ip['ttl'],
- 'seed': ip.get('seed', 1),
+ 'srcseed': ip.get('srcseed', 1),
+ 'dstseed': ip.get('dstseed', 1),
'srcip': srcip,
'dstip': dstip,
'srcmask': srcmask,
diff --git a/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py b/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
index e078d70ad..92ceeae83 100644
--- a/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
+++ b/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
@@ -38,7 +38,8 @@ TRAFFIC_PARAMETERS = {
},
'outer_l3': {
'count': 512,
- 'seed': 1,
+ 'srcseed': 10,
+ 'dstseed': 20,
'dscp': 0,
'proto': 'udp',
'ttl': 32,
@@ -69,7 +70,8 @@ TRAFFIC_PARAMETERS = {
},
'outer_l3': {
'count': 1024,
- 'seed': 1,
+ 'srcseed': 30,
+ 'dstseed': 40,
'dscp': 0,
'proto': 'udp',
'ttl': 32,