summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/vswitch_controller_p2p.py4
-rw-r--r--core/vswitch_controller_pxp.py4
-rwxr-xr-xdocs/configguide/installation.rst2
-rw-r--r--docs/userguide/teststeps.rst4
-rwxr-xr-xdocs/userguide/yardstick.rst5
l---------systems/ubuntu/16.041
l---------systems/ubuntu/16.101
-rw-r--r--testcases/testcase.py3
-rw-r--r--tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py9
-rw-r--r--tools/pkt_gen/testcenter/testcenter-rfc2889-rest.py9
-rw-r--r--tools/pkt_gen/trafficgen/trafficgenhelper.py2
-rwxr-xr-xvsperf2
-rw-r--r--yardstick/tests/p2p_rfc2544_throughput_sample.yaml2
-rw-r--r--yardstick/tests/rfc2544_back2back_dummy.yaml2
-rw-r--r--yardstick/tests/rfc2544_continuous_dummy.yaml2
-rw-r--r--yardstick/tests/rfc2544_throughput_dummy.yaml2
16 files changed, 35 insertions, 19 deletions
diff --git a/core/vswitch_controller_p2p.py b/core/vswitch_controller_p2p.py
index e9ab5cc4..de3fcc0d 100644
--- a/core/vswitch_controller_p2p.py
+++ b/core/vswitch_controller_p2p.py
@@ -158,14 +158,14 @@ class VswitchControllerP2P(IVswitchController):
dst_ip_value = netaddr.IPAddress(self._traffic['l3']['dstip']).value
for i in range(int(self._traffic['multistream'])):
tmp_ip = netaddr.IPAddress(dst_ip_value + i)
- flow_template.update({'dl_type':'0x800', 'nw_dst':tmp_ip})
+ flow_template.update({'dl_type':'0x0800', 'nw_dst':tmp_ip})
# optimize flow insertion by usage of cache
self._vswitch.add_flow(bridge, flow_template, cache='on')
elif self._traffic['stream_type'] == 'L4':
# read transport protocol from configuration and iterate through its destination port
proto = _PROTO_TCP if self._traffic['l3']['proto'].lower() == 'tcp' else _PROTO_UDP
for i in range(int(self._traffic['multistream'])):
- flow_template.update({'dl_type':'0x800', 'nw_proto':proto, 'tp_dst':i})
+ flow_template.update({'dl_type':'0x0800', 'nw_proto':proto, 'tp_dst':i})
# optimize flow insertion by usage of cache
self._vswitch.add_flow(bridge, flow_template, cache='on')
else:
diff --git a/core/vswitch_controller_pxp.py b/core/vswitch_controller_pxp.py
index 6f53b5ac..d4d1e764 100644
--- a/core/vswitch_controller_pxp.py
+++ b/core/vswitch_controller_pxp.py
@@ -156,9 +156,9 @@ class VswitchControllerPXP(IVswitchController):
flow_p.update({'dl_dst':tmp_mac})
elif self._traffic['stream_type'] == 'L3':
tmp_ip = netaddr.IPAddress(dst_ip_value + stream)
- flow_p.update({'dl_type':'0x800', 'nw_dst':tmp_ip})
+ flow_p.update({'dl_type':'0x0800', 'nw_dst':tmp_ip})
elif self._traffic['stream_type'] == 'L4':
- flow_p.update({'dl_type':'0x800', 'nw_proto':proto, 'tp_dst':stream})
+ flow_p.update({'dl_type':'0x0800', 'nw_proto':proto, 'tp_dst':stream})
else:
raise RuntimeError('Unknown stream_type {}'.format(self._traffic['stream_type']))
diff --git a/docs/configguide/installation.rst b/docs/configguide/installation.rst
index 51aa469d..5010aefd 100755
--- a/docs/configguide/installation.rst
+++ b/docs/configguide/installation.rst
@@ -16,6 +16,8 @@ Supported Operating Systems
* RedHat 7.2 Enterprise Linux
* RedHat 7.3 Enterprise Linux
* Ubuntu 14.04
+* Ubuntu 16.04
+* Ubuntu 16.10 (kernel 4.8 requires DPDK 16.11 and newer)
Supported vSwitches
-------------------
diff --git a/docs/userguide/teststeps.rst b/docs/userguide/teststeps.rst
index c00a2749..5e2d9570 100644
--- a/docs/userguide/teststeps.rst
+++ b/docs/userguide/teststeps.rst
@@ -633,10 +633,10 @@ and available in both csv and rst report files.
['vswitch', 'add_vport', 'br0'],
# priority must be higher than default 32768, otherwise flows won't match
['vswitch', 'add_flow', 'br0',
- {'in_port': '1', 'actions': ['output:#STEP[-2][1]'], 'idle_timeout': '0', 'dl_type':'0x800',
+ {'in_port': '1', 'actions': ['output:#STEP[-2][1]'], 'idle_timeout': '0', 'dl_type':'0x0800',
'nw_proto':'17', 'tp_dst':'0', 'priority': '33000'}],
['vswitch', 'add_flow', 'br0',
- {'in_port': '2', 'actions': ['output:#STEP[-2][1]'], 'idle_timeout': '0', 'dl_type':'0x800',
+ {'in_port': '2', 'actions': ['output:#STEP[-2][1]'], 'idle_timeout': '0', 'dl_type':'0x0800',
'nw_proto':'17', 'tp_dst':'0', 'priority': '33000'}],
['vswitch', 'add_flow', 'br0', {'in_port': '#STEP[-4][1]', 'actions': ['output:1'],
'idle_timeout': '0'}],
diff --git a/docs/userguide/yardstick.rst b/docs/userguide/yardstick.rst
index f118373b..985a25ad 100755
--- a/docs/userguide/yardstick.rst
+++ b/docs/userguide/yardstick.rst
@@ -146,7 +146,7 @@ Example of yaml file:
type: Vsperf
options:
testname: 'p2p_rfc2544_throughput'
- traffic_type: 'rfc2544'
+ traffic_type: 'rfc2544_throughput'
frame_size '64'
bidirectional: 'True'
iload: 100
@@ -183,7 +183,8 @@ are identical to the vswitchperf parameters passed through ``--test-params``
argument. Following options are supported:
- **traffic_type** - specifies the type of traffic executed by traffic generator;
- valid values are "rfc2544", "continuous" and "back2back"; Default: 'rfc2544'
+ Valid values are ``rfc2544_throughput``, ``rfc2544_continuous`` and ``rfc2544_back2back``.
+ Default: ``rfc2544_throughput``
- **frame_size** - a packet size for which test should be executed;
Multiple packet sizes can be tested by modification of Sequence runner
section inside YAML definition. Default: '64'
diff --git a/systems/ubuntu/16.04 b/systems/ubuntu/16.04
new file mode 120000
index 00000000..af805b45
--- /dev/null
+++ b/systems/ubuntu/16.04
@@ -0,0 +1 @@
+14.04 \ No newline at end of file
diff --git a/systems/ubuntu/16.10 b/systems/ubuntu/16.10
new file mode 120000
index 00000000..d17f205b
--- /dev/null
+++ b/systems/ubuntu/16.10
@@ -0,0 +1 @@
+16.04 \ No newline at end of file
diff --git a/testcases/testcase.py b/testcases/testcase.py
index 18ad4240..55c940a4 100644
--- a/testcases/testcase.py
+++ b/testcases/testcase.py
@@ -679,7 +679,8 @@ class TestCase(object):
""" Stop all VNFs started by TestSteps
"""
for vnf in self._step_vnf_list:
- self._step_vnf_list[vnf].stop()
+ if self._step_vnf_list[vnf]:
+ self._step_vnf_list[vnf].stop()
@staticmethod
def step_eval_param(param, STEP):
diff --git a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
index 538d8a8a..8da8ed17 100644
--- a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
+++ b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
@@ -490,8 +490,13 @@ def main():
resultsdb = args.results_dir + \
lab_server_resultsdb.split("/Results")[1]
- logger.info(
- "The local summary DB file has been saved to %s", resultsdb)
+ if not os.path.exists(resultsdb):
+ resultsdb = lab_server_resultsdb
+ logger.info("Failed to create the local summary DB File, using"
+ " the remote DB file instead.")
+ else:
+ logger.info(
+ "The local summary DB file has been saved to %s", resultsdb)
# The returns the "RFC2544ThroughputTestResultDetailedSummaryView"
# table view from the results database.
diff --git a/tools/pkt_gen/testcenter/testcenter-rfc2889-rest.py b/tools/pkt_gen/testcenter/testcenter-rfc2889-rest.py
index cfa425e8..ddb64562 100644
--- a/tools/pkt_gen/testcenter/testcenter-rfc2889-rest.py
+++ b/tools/pkt_gen/testcenter/testcenter-rfc2889-rest.py
@@ -265,8 +265,13 @@ def main():
resultsdb = args.results_dir + \
lab_server_resultsdb.split("/Results")[1]
- logger.info(
- "The local summary DB file has been saved to %s", resultsdb)
+ if not os.path.exists(resultsdb):
+ resultsdb = lab_server_resultsdb
+ logger.info("Failed to create the local summary DB file, using"
+ " the remote DB file instead.")
+ else:
+ logger.info(
+ "The local summary DB file has been saved to %s", resultsdb)
resultsdict = (
stc.perform("QueryResult",
diff --git a/tools/pkt_gen/trafficgen/trafficgenhelper.py b/tools/pkt_gen/trafficgen/trafficgenhelper.py
index 90c77b09..47f8b262 100644
--- a/tools/pkt_gen/trafficgen/trafficgenhelper.py
+++ b/tools/pkt_gen/trafficgen/trafficgenhelper.py
@@ -21,7 +21,7 @@ from collections import namedtuple
CMD_PREFIX = 'gencmd : '
TRAFFIC_DEFAULTS = {
- 'traffic_type' : 'rfc2544',
+ 'traffic_type' : 'rfc2544_throughput',
'frame_rate' : 100,
'bidir' : 'False', # will be passed as string in title format to tgen
'multistream' : 0,
diff --git a/vsperf b/vsperf
index 385f7929..44e45425 100755
--- a/vsperf
+++ b/vsperf
@@ -506,7 +506,7 @@ def main():
settings.setValue('mode', args['mode'])
- # set dpdk and ovs paths accorfing to VNF and VSWITCH
+ # set dpdk and ovs paths according to VNF and VSWITCH
if settings.getValue('mode') != 'trafficgen':
functions.settings_update_paths()
diff --git a/yardstick/tests/p2p_rfc2544_throughput_sample.yaml b/yardstick/tests/p2p_rfc2544_throughput_sample.yaml
index b633732b..91aa5d00 100644
--- a/yardstick/tests/p2p_rfc2544_throughput_sample.yaml
+++ b/yardstick/tests/p2p_rfc2544_throughput_sample.yaml
@@ -28,7 +28,7 @@ scenarios:
type: Vsperf
options:
testname: 'p2p_rfc2544_throughput'
- traffic_type: 'rfc2544'
+ traffic_type: 'rfc2544_throughput'
frame_size: '64'
bidirectional: 'True'
iload: 100
diff --git a/yardstick/tests/rfc2544_back2back_dummy.yaml b/yardstick/tests/rfc2544_back2back_dummy.yaml
index a3265c52..9fe834c5 100644
--- a/yardstick/tests/rfc2544_back2back_dummy.yaml
+++ b/yardstick/tests/rfc2544_back2back_dummy.yaml
@@ -30,7 +30,7 @@ scenarios:
type: Vsperf
options:
testname: 'rfc2544_back2back'
- traffic_type: 'back2back'
+ traffic_type: 'rfc2544_back2back'
frame_size: '64'
bidirectional: 'True'
iload: 100
diff --git a/yardstick/tests/rfc2544_continuous_dummy.yaml b/yardstick/tests/rfc2544_continuous_dummy.yaml
index fea0af3f..9d189c80 100644
--- a/yardstick/tests/rfc2544_continuous_dummy.yaml
+++ b/yardstick/tests/rfc2544_continuous_dummy.yaml
@@ -30,7 +30,7 @@ scenarios:
type: Vsperf
options:
testname: 'rfc2544_continuous'
- traffic_type: 'continuous'
+ traffic_type: 'rfc2544_continuous'
frame_size: '64'
bidirectional: 'True'
iload: 100
diff --git a/yardstick/tests/rfc2544_throughput_dummy.yaml b/yardstick/tests/rfc2544_throughput_dummy.yaml
index 81755c50..9ebf28c4 100644
--- a/yardstick/tests/rfc2544_throughput_dummy.yaml
+++ b/yardstick/tests/rfc2544_throughput_dummy.yaml
@@ -30,7 +30,7 @@ scenarios:
type: Vsperf
options:
testname: 'rfc2544_throughput'
- traffic_type: 'rfc2544'
+ traffic_type: 'rfc2544_throughput'
frame_size: '64'
bidirectional: 'True'
iload: 100