diff options
| -rw-r--r-- | ansible/install.yaml | 13 | ||||
| -rw-r--r-- | ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml | 33 | ||||
| -rw-r--r-- | ansible/roles/download_dpdk/defaults/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/download_samplevnfs/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/install_dpdk/tasks/main.yml | 17 | ||||
| -rw-r--r-- | ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml | 11 | ||||
| -rw-r--r-- | ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml | 15 | ||||
| -rw-r--r-- | docs/testing/user/userguide/glossary.rst | 60 | ||||
| -rw-r--r-- | yardstick/benchmark/core/task.py | 3 |
9 files changed, 126 insertions, 31 deletions
diff --git a/ansible/install.yaml b/ansible/install.yaml index 0c7ad7e92..f4f57bdc0 100644 --- a/ansible/install.yaml +++ b/ansible/install.yaml @@ -56,6 +56,8 @@ - name: Prepare baremetal and standalone servers hosts: yardstick-baremetal,yardstick-standalone become: yes + vars_files: + - roles/download_dpdk/defaults/main.yml environment: "{{ proxy_env }}" roles: @@ -69,15 +71,18 @@ - increase_open_file_limits - install_image_dependencies - role: download_dpdk - # dpdk_version: "17.02" + dpdk_version: "{{ dpdk_version_for_PROX }}" + - role: install_dpdk + dpdk_version: "{{ dpdk_version_for_PROX }}" + - download_samplevnfs + - role: install_samplevnf + vnf_name: PROX + - download_dpdk - install_dpdk - download_trex - install_trex - download_civetweb - install_civetweb - - download_samplevnfs - - role: install_samplevnf - vnf_name: PROX - role: install_samplevnf vnf_name: UDP_Replay - role: install_samplevnf diff --git a/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml b/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml index 9a70ff39a..c2f72cada 100644 --- a/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml +++ b/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml @@ -52,19 +52,43 @@ - install_image_dependencies - enable_hugepages_on_boot # can't update grub in chroot/docker - increase_open_file_limits # needed for collectd plugins - - download_dpdk - - install_dpdk - download_trex - install_trex - - download_pktgen - - install_pktgen - download_civetweb - install_civetweb + loop_control: + loop_var: role_item + environment: "{{ proxy_env }}" + +- include_role: + name: "{{ role_item }}" + vars: + dpdk_version: "{{ dpdk_version_for_PROX }}" + with_items: + - download_dpdk + - install_dpdk - download_samplevnfs loop_control: loop_var: role_item environment: "{{ proxy_env }}" +- name: Install PROX + include_role: + name: install_samplevnf + vars: + vnf_name: PROX + +- include_role: + name: "{{ role_item }}" + with_items: + - download_dpdk + - install_dpdk + - download_pktgen + - install_pktgen + loop_control: + loop_var: role_item + environment: "{{ proxy_env }}" + - include_vars: roles/install_dpdk/defaults/main.yml when: INSTALL_BIN_PATH is undefined @@ -75,7 +99,6 @@ - include_role: name: install_samplevnf with_items: - - PROX - UDP_Replay - ACL - FW diff --git a/ansible/roles/download_dpdk/defaults/main.yml b/ansible/roles/download_dpdk/defaults/main.yml index 83711881b..b2d959eed 100644 --- a/ansible/roles/download_dpdk/defaults/main.yml +++ b/ansible/roles/download_dpdk/defaults/main.yml @@ -1,11 +1,11 @@ --- dpdk_version: "17.05" +dpdk_version_for_PROX: "18.11" dpdk_url: "http://fast.dpdk.org/rel/dpdk-{{ dpdk_version }}.tar.xz" dpdk_file: "{{ dpdk_url|basename }}" dpdk_unarchive: "{{ dpdk_file|regex_replace('[.]tar[.]xz$', '') }}" dpdk_dest: "{{ clone_dest }}/" -#NOTE(ralonsoh): DPDK > 17.02 are currently unsupported due to prox build issues dpdk_md5: "16.07.2": "md5:4922ea2ec935b64ff5c191fec53344a6" "16.11.7": "md5:c081d113dfd57633e3bc3ebc802691be" @@ -16,3 +16,4 @@ dpdk_md5: "17.11.3": "md5:68ca84ac878011acf44e75d33b46f55b" #unsupported "18.02.2": "md5:75ad6d39b513649744e49c9fcbbb9ca5" #unsupported "18.05": "md5:9fc86367cd9407ff6a8dfea56c4eddc4" #unsupported + "18.11": "md5:04b86f4a77f4f81a7fbd26467dd2ea9f" # Not supported by SampleVNFs except PROX diff --git a/ansible/roles/download_samplevnfs/defaults/main.yml b/ansible/roles/download_samplevnfs/defaults/main.yml index 104f594f5..5ddc9f0f9 100644 --- a/ansible/roles/download_samplevnfs/defaults/main.yml +++ b/ansible/roles/download_samplevnfs/defaults/main.yml @@ -13,4 +13,4 @@ samplevnf_url: "https://git.opnfv.org/samplevnf" samplevnf_dest: "{{ clone_dest }}/samplevnf" -samplevnf_version: "3afd384b7e68a3cd29f4d2cdf39785f8441d0b6f" +samplevnf_version: "47123bfc1b3c0d0b01884aebbce1a3e09ad7ddb0" diff --git a/ansible/roles/install_dpdk/tasks/main.yml b/ansible/roles/install_dpdk/tasks/main.yml index d1dc2900b..a1a377eb1 100644 --- a/ansible/roles/install_dpdk/tasks/main.yml +++ b/ansible/roles/install_dpdk/tasks/main.yml @@ -20,6 +20,10 @@ # with_fileglob: # - "{{ local_nsb_path }}/patches/dpdk_custom_patch/0*.patch" +- debug: + var: dpdk_version + verbosity: 2 + - name: find kernel for image, (including chroot) find_kernel: kernel: "{{ ansible_kernel }}" @@ -106,6 +110,7 @@ src: "{{ dpdk_path }}/{{ dpdk_make_arch }}/kmod/igb_uio.ko" dest: "{{ dpdk_module_dir }}/igb_uio.ko" remote_src: yes + when: dpdk_version is version(dpdk_version_for_PROX, '>=') - name: run depmod for dpdk_kernel command: depmod "{{ dpdk_kernel }}" @@ -114,20 +119,14 @@ path: "{{ INSTALL_BIN_PATH }}" state: directory -- set_fact: - major: "{{ dpdk_version.split('.')[0] }}" - minor: "{{ dpdk_version.split('.')[1] }}" - -- set_fact: - major_minor_version: "{{ major }}.{{ minor }}" - - name: copy dpdk-devbind.py to correct location copy: - src: "{{ dpdk_devbind_usertools if major_minor_version|float >= 17.02 else dpdk_devbind_tools }}" + src: "{{ dpdk_devbind_usertools if dpdk_version is version('17.02', '>=') else dpdk_devbind_tools }}" dest: "{{ INSTALL_BIN_PATH }}/dpdk-devbind.py" remote_src: yes force: yes mode: 0755 + when: dpdk_version is version(dpdk_version_for_PROX, '>=') - name: make vPE binary command: make -j {{ ansible_processor_vcpus }} @@ -135,6 +134,7 @@ chdir: "{{ dpdk_path }}/examples/ip_pipeline" environment: RTE_SDK: "{{ dpdk_path }}" + when: dpdk_version is version(dpdk_version_for_PROX, '!=') - name: Copy vPE to correct location copy: @@ -143,3 +143,4 @@ remote_src: yes force: yes mode: 0755 + when: dpdk_version is version(dpdk_version_for_PROX, '!=') diff --git a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml index 84e1f9adf..4f4d7d075 100644 --- a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml +++ b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml @@ -15,6 +15,8 @@ - hosts: yardstick-standalone:jumphost vars: clone_dir: /tmp/yardstick-clone + vars_files: + - roles/download_dpdk/defaults/main.yml environment: "{{ proxy_env }}" @@ -28,16 +30,19 @@ # needed for collectd plugins - increase_open_file_limits - install_image_dependencies - - role: download_dpdk -# dpdk_version: "17.02" - - install_dpdk - download_trex - install_trex - download_civetweb - install_civetweb + - role: download_dpdk + dpdk_version: "{{ dpdk_version_for_PROX }}" + - role: install_dpdk + dpdk_version: "{{ dpdk_version_for_PROX }}" - download_samplevnfs - role: install_samplevnf vnf_name: PROX + - download_dpdk + - install_dpdk - role: install_samplevnf vnf_name: UDP_Replay - role: install_samplevnf diff --git a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml index b27933bd1..d894c3dc4 100644 --- a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml +++ b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml @@ -16,6 +16,8 @@ connection: chroot vars: clone_dir: /tmp/yardstick-clone + vars_files: + - roles/download_dpdk/defaults/main.yml pre_tasks: - debug: @@ -35,18 +37,21 @@ - increase_open_file_limits - modify_cloud_config - install_image_dependencies - - role: download_dpdk -# dpdk_version: "17.02" - - install_dpdk - download_trex - install_trex - - download_pktgen - - install_pktgen - download_civetweb - install_civetweb + - role: download_dpdk + dpdk_version: "{{ dpdk_version_for_PROX }}" + - role: install_dpdk + dpdk_version: "{{ dpdk_version_for_PROX }}" - download_samplevnfs - role: install_samplevnf vnf_name: PROX + - download_dpdk + - install_dpdk + - download_pktgen + - install_pktgen - role: install_samplevnf vnf_name: UDP_Replay - role: install_samplevnf diff --git a/docs/testing/user/userguide/glossary.rst b/docs/testing/user/userguide/glossary.rst index 6a153943c..cef9b69a5 100644 --- a/docs/testing/user/userguide/glossary.rst +++ b/docs/testing/user/userguide/glossary.rst @@ -13,23 +13,54 @@ Glossary API Application Programming Interface + Barometer + OPNFV NFVi Service Assurance project. Barometer upstreams changes to + collectd, OpenStack, etc to improve features related to NFVi monitoring + and service assurance. + More info on: https://opnfv-barometer.readthedocs.io/en/latest/ + + collectd + collectd is a system statistics collection daemon. + More info on: https://collectd.org/ + + context + A context describes the environment in which a yardstick testcase will + be run. It can refer to a pre-provisioned environment, or an environment + that will be set up using OpenStack or Kubernetes. + Docker Docker provisions and manages containers. Yardstick and many other OPNFV projects are deployed in containers. Docker is required to launch the containerized versions of these projects. - DPI - Deep Packet Inspection - DPDK Data Plane Development Kit + DPI + Deep Packet Inspection + DSCP Differentiated Services Code Point + flavor + A specification of virtual resources used by OpenStack in the creation + of a VM instance. + + Grafana + A visualization tool, used in Yardstick to retrieve test data from + InfluxDB and display it. Grafana works by defining dashboards, which are + combinations of visualization panes (e.g. line charts and gauges) and + forms that assist the user in formulating SQL-like queries for InfluxDB. + More info on: https://grafana.com/ + IGMP Internet Group Management Protocol + InfluxDB + One of the Dispatchers supported by Yardstick, it allows test results to + be reported to a time-series database. + More info on: https://www.influxdata.com/ + IOPS Input/Output Operations Per Second A performance measurement used to benchmark storage devices. @@ -43,6 +74,9 @@ Glossary deployment, scaling and management of containerized applications. It is one of the contexts supported in Yardstick. + MPLS + Multiprotocol Label Switching + NFV Network Function Virtualization NFV is an initiative to take network services which were traditionally run @@ -56,6 +90,10 @@ Glossary NIC Network Interface Controller + NSB + Network Services Benchmarking. A subset of Yardstick features concerned + with NFVI and VNF characterization. + OpenStack OpenStack is a cloud operating system that controls pools of compute, storage, and networking resources. OpenStack is an open source project @@ -77,6 +115,18 @@ Glossary performance in Input/Output Operations Per Second (IOPS), throttling agreements, and performance expectations at peak load + runner + The part of a Yardstick testcase that determines how the test will be run + (e.g. for x iterations, y seconds or until state z is reached). The runner + also determines when the metrics are collected/reported. + + SampleVNF + OPNFV project providing a repository of reference VNFs. + More info on: https://opnfv-samplevnf.readthedocs.io/en/latest/ + + scenario + The part of a Yardstick testcase that describes each test step. + SLA Service Level Agreement An SLA is an agreement between a service provider and a customer to @@ -92,6 +142,10 @@ Glossary SUT System Under Test + testcase + A task in Yardstick; the yaml file that is read by Yardstick to + determine how to run a test. + ToS Type of Service diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py index 1dfd6c31e..477dbcc57 100644 --- a/yardstick/benchmark/core/task.py +++ b/yardstick/benchmark/core/task.py @@ -11,6 +11,7 @@ import sys import os from collections import OrderedDict +import six import yaml import atexit import ipaddress @@ -313,7 +314,7 @@ class Task(object): # pragma: no cover return {k: self._parse_options(v) for k, v in op.items()} elif isinstance(op, list): return [self._parse_options(v) for v in op] - elif isinstance(op, str): + elif isinstance(op, six.string_types): return self.outputs.get(op[1:]) if op.startswith('$') else op else: return op |