diff options
25 files changed, 507 insertions, 285 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index afb2ce5c6..a1b88fe69 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,7 +21,9 @@ ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick ENV RELENG_REPO_DIR ${REPOS_DIR}/releng RUN sed -i -e 's/^deb /deb [arch=amd64] /g' /etc/apt/sources.list RUN sed -i -e 's/^deb-src /# deb-src /g' /etc/apt/sources.list +RUN echo "APT::Default-Release \"trusty\";" > /etc/apt/apt.conf.d/default-distro RUN echo "\n\ +deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ xenial-updates universe \n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty main universe multiverse restricted \n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main universe multiverse restricted \n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty-security main universe multiverse restricted \n\ @@ -30,7 +32,7 @@ RUN echo "vm.mmap_min_addr = 0" > /etc/sysctl.d/mmap_min_addr.conf RUN dpkg --add-architecture arm64 RUN apt-get update && apt-get install -y \ - qemu-user-static \ + qemu-user-static/xenial \ libc6:arm64 \ wget \ expect \ diff --git a/docs/testing/user/userguide/01-introduction.rst b/docs/testing/user/userguide/01-introduction.rst index 0e0eea002..2aa870c2a 100755 --- a/docs/testing/user/userguide/01-introduction.rst +++ b/docs/testing/user/userguide/01-introduction.rst @@ -37,35 +37,38 @@ About This Document This document consists of the following chapters: +* Chapter :doc:`01-introduction` provides a brief introduction to yardstick + project's goal and scope and gives the structure of this document. + * Chapter :doc:`02-methodology` describes the methodology implemented by the Yardstick Project for :term:`NFVI` verification. * Chapter :doc:`03-architecture` provides information on the software architecture of yardstick. -* Chapter :doc:`04-vtc-overview` provides information on the :term:`VTC`. +* Chapter :doc:`04-installation` provides instructions to install *Yardstick*. + +* Chapter :doc:`05-yardstick_plugin` provides information on how to integrate + other OPNFV testing projects into *Yardstick*. + +* Chapter :doc:`06-result-store-InfluxDB` provides inforamtion on how to run + plug-in test cases and store test results into community's InfluxDB. + +* Chapter :doc:`07-vtc-overview` provides information on the :term:`VTC`. -* Chapter :doc:`05-apexlake_installation` provides instructions to install the +* Chapter :doc:`08-apexlake_installation` provides instructions to install the experimental framework *ApexLake* -* Chapter :doc:`06-apexlake_api` explains how this framework is integrated in +* Chapter :doc:`09-apexlake_api` explains how this framework is integrated in *Yardstick*. -* Chapter :doc:`07-nsb-overview` describes the methodology implemented by the +* Chapter :doc:`10-nsb-overview` describes the methodology implemented by the yardstick - Network service benchmarking to test real world usecase for a given VNF -* Chapter :doc:`08-nsb_installation` provides instructions to install +* Chapter :doc:`11-nsb_installation` provides instructions to install *Yardstick - Network service benchmarking testing*. -* Chapter :doc:`09-installation` provides instructions to install *Yardstick*. - -* Chapter :doc:`10-yardstick_plugin` provides information on how to integrate - other OPNFV testing projects into *Yardstick*. - -* Chapter :doc:`11-result-store-InfluxDB` provides inforamtion on how to run - plug-in test cases and store test results into community's InfluxDB. - * Chapter :doc:`12-list-of-tcs` includes a list of available Yardstick test cases. diff --git a/docs/testing/user/userguide/03-architecture.rst b/docs/testing/user/userguide/03-architecture.rst index 03bf00f58..95fe050e8 100755 --- a/docs/testing/user/userguide/03-architecture.rst +++ b/docs/testing/user/userguide/03-architecture.rst @@ -187,9 +187,9 @@ run test measurement scripts through the ssh tunnel. After all TestScenaio is finished, TaskCommands will undeploy the heat stack. Then the whole test is finished. -.. image:: images/Logical_view.png +.. image:: images/Yardstick_framework_architecture_in_D.png :width: 800px - :alt: Yardstick Logical View + :alt: Yardstick framework architecture in Danube Process View (Test execution flow) ================================== @@ -236,7 +236,7 @@ Yardstick Directory structure **yardstick/** - Yardstick main directory. -*ci/* - Used for continuous integration of Yardstick at different PODs and +*/tests/ci/* - Used for continuous integration of Yardstick at different PODs and with support for different installers. *docs/* - All documentation is stored here, such as configuration guides, diff --git a/docs/testing/user/userguide/09-installation.rst b/docs/testing/user/userguide/04-installation.rst index 9c2082a27..c1db21220 100644 --- a/docs/testing/user/userguide/09-installation.rst +++ b/docs/testing/user/userguide/04-installation.rst @@ -6,11 +6,12 @@ Yardstick Installation ====================== + Abstract -------- -Yardstick supports installation on Ubuntu 14.04 or via a Docker image. The -installation procedure on Ubuntu 14.04 or via the docker image are detailed in +Yardstick supports installation by Docker or directly in Ubuntu. The +installation procedure for Docker and direct installation are detailed in the section below. To use Yardstick you should have access to an OpenStack environment, with at @@ -57,47 +58,18 @@ the end of this document. The section details some tips/tricks which *may* be of help in a proxified environment. -Installing Yardstick on Ubuntu 14.04 ------------------------------------- - -.. _install-framework: - -You can install Yardstick framework directly on Ubuntu 14.04 or in an Ubuntu -14.04 Docker image. No matter which way you choose to install Yardstick -framework, the following installation steps are identical. - -If you choose to use the Ubuntu 14.04 Docker image, You can pull the Ubuntu -14.04 Docker image from Docker hub: - -:: - - docker pull ubuntu:14.04 - -Installing Yardstick framework -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Download source code and install python dependencies: - -:: - - git clone https://gerrit.opnfv.org/gerrit/yardstick - cd yardstick - ./install.sh - - Installing Yardstick using Docker --------------------------------- -Yardstick has a Docker image, this Docker image (**Yardstick-stable**) -serves as a replacement for installing the Yardstick framework in a virtual -environment (for example as done in :ref:`install-framework`). -It is recommended to use this Docker image to run Yardstick test. +Yardstick has a Docker image, +**It is recommended to use this Docker image to run Yardstick test**. Pulling the Yardstick Docker image ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. _dockerhub: https://hub.docker.com/r/opnfv/yardstick/ -Pull the Yardstick Docker image ('opnfv/yardstick') from the public dockerhub +Pull the Yardstick Docker image (**opnfv/yardstick**) from the public dockerhub registry under the OPNFV account: [dockerhub_], with the following docker command:: @@ -110,15 +82,114 @@ following docker command:: REPOSITORY TAG IMAGE ID CREATED SIZE opnfv/yardstick stable a4501714757a 1 day ago 915.4 MB -Run the Docker image: +Run the Docker image to get a Yardstick container +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :: - docker run --privileged=true -it opnfv/yardstick:stable /bin/bash + docker run -itd --privileged -v /var/run/docker.sock:/var/run/docker.sock -p 8888:5000 -e INSTALLER_IP=192.168.200.2 -e INSTALLER_TYPE=compass --name yardstick opnfv/yardstick:stable + +note: + ++----------------------------------------------+------------------------------+ +| parameters | Detail | ++==============================================+==============================+ +| -itd | -i: interactive, Keep STDIN | +| | open even if not attached. | +| | -t: allocate a pseudo-TTY. | +| | -d: run container in | +| | detached mode, in the | +| | background. | ++----------------------------------------------+------------------------------+ +| --privileged | If you want to build | +| | yardstick-image in yardstick | +| | container, this parameter is | +| | needed. | ++----------------------------------------------+------------------------------+ +| -e INSTALLER_IP=192.168.200.2 | If you want to use yardstick | +| | env prepare command(or | +| -e INSTALLER_TYPE=compass | related API) to load the | +| | images that yardstick needs, | +| | these parameters should be | +| | provided. | +| | The INSTALLER_IP and | +| | INSTALLER_TYPE are depending | +| | on your OpenStack installer, | +| | currently apex, compass, | +| | fuel and joid are supported. | +| | If you use other installers, | +| | such as devstack, these | +| | parameters can be ignores. | ++----------------------------------------------+------------------------------+ +| -p 8888:5000 | If you want to call | +| | yardstick API out of | +| | yardstick container, this | +| | parameter is needed. | ++----------------------------------------------+------------------------------+ +| -v /var/run/docker.sock:/var/run/docker.sock | If you want to use yardstick | +| | env grafana/influxdb to | +| | create a grafana/influxdb | +| | container out of yardstick | +| | container, this parameter is | +| | needed. | ++----------------------------------------------+------------------------------+ +| --name yardstick | The name for this container, | +| | not needed and can be | +| | defined by the user. | ++----------------------------------------------+------------------------------+ + +Enter Yardstick container +^^^^^^^^^^^^^^^^^^^^^^^^^ + +:: -In the container the Yardstick repository is located in the /home/opnfv/repos + docker exec -it yardstick /bin/bash + +In the container, the Yardstick repository is located in the /home/opnfv/repos directory. +In Danube release, we have improved the Yardstick installation steps. +Now Yardstick provides a CLI to prepare openstack environment variables and +load yardstick images:: + + yardstick env prepare + +If you ues this command. you can skip the following sections about how to +prepare openstack environment variables, load yardstick images and load +yardstick flavor manually. + + +Installing Yardstick directly in Ubuntu +--------------------------------------- + +.. _install-framework: + +Alternatively you can install Yardstick framework directly in Ubuntu or in an Ubuntu Docker +image. No matter which way you choose to install Yardstick framework, the +following installation steps are identical. + +If you choose to use the Ubuntu Docker image, You can pull the Ubuntu +Docker image from Docker hub: + +:: + + docker pull ubuntu:16.04 + + +Installing Yardstick framework +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Download source code and install Yardstick framework: + +:: + + git clone https://gerrit.opnfv.org/gerrit/yardstick + cd yardstick + ./install.sh + +For installing yardstick directly in Ubuntu, the **yardstick env command** is not available. +You need to prepare openstack environment variables, load yardstick images and load +yardstick flavor manually. + OpenStack parameters and credentials ------------------------------------ @@ -193,8 +264,6 @@ by following the commands above): :: - export YARD_IMG_ARCH="amd64" - sudo echo "Defaults env_keep += \"YARD_IMG_ARCH\"" >> /etc/sudoers sudo ./tools/yardstick-img-modify tools/ubuntu-server-cloudimg-modify.sh **Warning:** the script will create files by default in: @@ -215,12 +284,28 @@ Example command: --disk-format qcow2 --container-format bare \ --file /tmp/workspace/yardstick/yardstick-image.img -Some Yardstick test cases use a Cirros image, you can find one at -http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img +Some Yardstick test cases use a Cirros image and a Ubuntu 14.04 image, you can find one at +http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img, https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img + +Add cirros and ubuntu image to OpenStack: +:: + + openstack image create \ + --disk-format qcow2 \ + --container-format bare \ + --file $cirros_image_file \ + cirros-0.3.3 + + openstack image create \ + --disk-format qcow2 \ + --container-format bare \ + --file $ubuntu_image_file \ + Ubuntu-14.04 Automatic flavor and image creation ------------------------------------ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + Yardstick has a script for automatic creating yardstick flavor and building guest images. This script is mainly used in CI, but you can still use it in your local environment. @@ -229,18 +314,9 @@ Example command: :: - export YARD_IMG_ARCH="amd64" - sudo echo "Defaults env_keep += \"YARD_IMG_ARCH\"" >> /etc/sudoers source $YARDSTICK_REPO_DIR/tests/ci/load_images.sh -Yardstick default key pair -^^^^^^^^^^^^^^^^^^^^^^^^^^ -Yardstick uses a SSH key pair to connect to the guest image. This key pair can -be found in the ``resources/files`` directory. To run the ``ping-hot.yaml`` test -sample, this key pair needs to be imported to the OpenStack environment. - - Examples and verifying the install ---------------------------------- @@ -251,7 +327,7 @@ image can be found in glance and openrc file is sourced. Below is an example invocation of yardstick help command and ping.py test sample: :: - yardstick –h + yardstick -h yardstick task start samples/ping.yaml Each testing tool supported by Yardstick has a sample configuration file. @@ -263,6 +339,30 @@ Default location for the output is ``/tmp/yardstick.out``. Deploy InfluxDB and Grafana locally ------------------------------------ +The 'yardstick env' command can also help you to build influxDB and Grafana in +your local environment. + +Create InfluxDB container and config with the following command:: + + yardstick env influxdb + + +Create Grafana container and config:: + + yardstick env grafana + +Then you can run a test case and visit http://host_ip:3000(user:admin,passwd:admin) to see the results. + +note: Using **yardstick env** command to deploy InfluxDB and Grafana requires +Jump Server's docker API version => 1.24. You can use the following command to +check the docker API version: + +:: + + docker version + +The following sections describe how to deploy influxDB and Grafana manually. + .. pull docker images Pull docker images @@ -398,4 +498,3 @@ the ci environment. "task_args" is where you can specify the task arguments for All in all, to create a test suite in yardstick, you just need to create a suite yaml file and add test cases and constraint or task arguments if necessary. - diff --git a/docs/testing/user/userguide/10-yardstick_plugin.rst b/docs/testing/user/userguide/05-yardstick_plugin.rst index f16dedd02..b724b361b 100644 --- a/docs/testing/user/userguide/10-yardstick_plugin.rst +++ b/docs/testing/user/userguide/05-yardstick_plugin.rst @@ -84,9 +84,10 @@ script can be used to generate it. echo "OS_PROJECT_NAME="$PROJECT_NAME >> ~/storperf_admin-rc echo "OS_TENANT_ID="$TENANT_ID >> ~/storperf_admin-rc +The generated "storperf_admin-rc" file will be stored under the root directory. If you installed Yardstick using Docker, this file will be located in the container. You may need to copy it to the root directory of the deployed host. Step 1: Plug-in configuration file preparation -++++++++++++++++++++++++++++++++++++++++++++++ +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> To install a plug-in, first you need to prepare a plug-in configuration file in YAML format and store it in the "plugin" directory. The plugin configration file @@ -111,7 +112,7 @@ Here the Storperf will be installed on IP 192.168.23.2 which is the Jump Host in my local environment. Step 2: Plug-in install/remove scripts preparation -++++++++++++++++++++++++++++++++++++++++++++++++++ +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Under "yardstick/resource/scripts directory", there are two folders: a "install" folder and a "remove" folder. You need to store the plug-in install/remove script @@ -124,7 +125,7 @@ For example, the install and remove scripts for Storperf are both named to "stor Step 3: Install and remove Storperf -+++++++++++++++++++++++++++++++++++ +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> To install Storperf, simply execute the following command :: diff --git a/docs/testing/user/userguide/11-result-store-InfluxDB.rst b/docs/testing/user/userguide/06-result-store-InfluxDB.rst index a0bb48a80..a0bb48a80 100644 --- a/docs/testing/user/userguide/11-result-store-InfluxDB.rst +++ b/docs/testing/user/userguide/06-result-store-InfluxDB.rst diff --git a/docs/testing/user/userguide/12-grafana.rst b/docs/testing/user/userguide/07-grafana.rst index 416857b71..416857b71 100644 --- a/docs/testing/user/userguide/12-grafana.rst +++ b/docs/testing/user/userguide/07-grafana.rst diff --git a/docs/testing/user/userguide/04-vtc-overview.rst b/docs/testing/user/userguide/08-vtc-overview.rst index 82b20cad5..f30bf7cc5 100644 --- a/docs/testing/user/userguide/04-vtc-overview.rst +++ b/docs/testing/user/userguide/08-vtc-overview.rst @@ -114,9 +114,12 @@ run the build.sh with root privileges Run === -sudo ./pfbridge -a eth1 -b eth2 +:: + + sudo ./pfbridge -a eth1 -b eth2 + Development Environment ======================= -Ubuntu 14.04 +Ubuntu 14.04 Ubuntu 16.04 diff --git a/docs/testing/user/userguide/05-apexlake_installation.rst b/docs/testing/user/userguide/09-apexlake_installation.rst index d4493e0f8..0d8ef143f 100644 --- a/docs/testing/user/userguide/05-apexlake_installation.rst +++ b/docs/testing/user/userguide/09-apexlake_installation.rst @@ -251,6 +251,8 @@ It is required to do the reset to the specified commit ID. It is also requires the creation a configuration file using the following command: +:: + SMCROUTE_NIC=(name of the nic) where name of the nic is the name used previously for the variable "name_if_2". diff --git a/docs/testing/user/userguide/06-apexlake_api.rst b/docs/testing/user/userguide/10-apexlake_api.rst index 35a1dbe3e..35a1dbe3e 100644 --- a/docs/testing/user/userguide/06-apexlake_api.rst +++ b/docs/testing/user/userguide/10-apexlake_api.rst diff --git a/docs/testing/user/userguide/07-nsb-overview.rst b/docs/testing/user/userguide/11-nsb-overview.rst index 19719f1a7..6dfa521d1 100644 --- a/docs/testing/user/userguide/07-nsb-overview.rst +++ b/docs/testing/user/userguide/11-nsb-overview.rst @@ -23,33 +23,53 @@ benchmarking with repeatable and deterministic methods. The Network Service Benchmarking (NSB) extends the yardstick framework to do VNF characterization and benchmarking in three different execution -environments viz., bare metal i.e. native Linux environment, standalone virtual +environments - bare metal i.e. native Linux environment, standalone virtual environment and managed virtualized environment (e.g. Open stack etc.). It also brings in the capability to interact with external traffic generators both hardware & software based for triggering and validating the traffic according to user defined profiles. NSB extension includes: - • Generic data models of Network Services, based on ETSI specs - • New Standalone context for VNF testing like SRIOV, OVS, OVS-DPDK etc - • Generic VNF configuration models and metrics implemented with Python + + - Generic data models of Network Services, based on ETSI spec (ETSI GS NFV-TST 001) + .. _ETSI GS NFV-TST 001: http://www.etsi.org/deliver/etsi_gs/NFV-TST/001_099/001/01.01.01_60/gs_nfv-tst001v010101p.pdf + + - New Standalone context for VNF testing like SRIOV, OVS, OVS-DPDK etc + + - Generic VNF configuration models and metrics implemented with Python classes - • Traffic generator features and traffic profiles - • L1-L3 state-less traffic profiles - • L4-L7 state-full traffic profiles - • Tunneling protocol / network overlay support - • Test case samples - • Ping - • Trex - • vPE,vCGNAT, vFirewall etc - ipv4 throughput, latency etc - • Traffic generators like Trex, ab/nginx, ixia, iperf etc - • KPIs for a given use case: - • System agent support for collecting NFvi KPI. This includes: - o CPU statistic - o Memory BW - o OVS-DPDK Stats - • Network KPIs – eg, inpackets, outpackets, thoughput, latency etc - • VNF KPIs – packet_in, packet_drop, packet_fwd etc + + - Traffic generator features and traffic profiles + + - L1-L3 state-less traffic profiles + + - L4-L7 state-full traffic profiles + + - Tunneling protocol / network overlay support + + - Test case samples + + - Ping + + - Trex + + - vPE,vCGNAT, vFirewall etc - ipv4 throughput, latency etc + + - Traffic generators like Trex, ab/nginx, ixia, iperf etc + + - KPIs for a given use case: + + - System agent support for collecting NFVi KPI. This includes: + + - CPU statistic + + - Memory BW + + - OVS-DPDK Stats + + - Network KPIs, e.g., inpackets, outpackets, thoughput, latency etc + + - VNF KPIs, e.g., packet_in, packet_drop, packet_fwd etc Architecture ============ @@ -72,18 +92,25 @@ makes an example how the real Network Operator use-case can map into ETSI Network service definition Network Service framework performs the necessary test steps. It may involve - o Interacting with traffic generator and providing the inputs on traffic + + - Interacting with traffic generator and providing the inputs on traffic type / packet structure to generate the required traffic as per the test case. Traffic profiles will be used for this. - o Executing the commands required for the test procedure and analyses the + + - Executing the commands required for the test procedure and analyses the command output for confirming whether the command got executed correctly or not. E.g. As per the test case, run the traffic for the given time period / wait for the necessary time delay - o Verify the test result. - o Validate the traffic flow from SUT - o Fetch the table / data from SUT and verify the value as per the test case - o Upload the logs from SUT onto the Test Harness server - o Read the KPI’s provided by particular VNF + + - Verify the test result. + + - Validate the traffic flow from SUT + + - Fetch the table / data from SUT and verify the value as per the test case + + - Upload the logs from SUT onto the Test Harness server + + - Read the KPI's provided by particular VNF Components of Network Service ------------------------------ @@ -124,14 +151,19 @@ The TREX tool can generate any kind of stateless traffic. +--------+ +-------+ +--------+ Supported testcases scenarios: -• Correlated UDP traffic using TREX traffic generator and replay VNF. - o using different IMIX configuration like pure voice, pure video traffic etc - o using different number IP flows like 1 flow, 1K, 16K, 64K, 256K, 1M flows - o Using different number of rules configured like 1 rule, 1K, 10K rules + + - Correlated UDP traffic using TREX traffic generator and replay VNF. + + - using different IMIX configuration like pure voice, pure video traffic etc + + - using different number IP flows like 1 flow, 1K, 16K, 64K, 256K, 1M flows + + - Using different number of rules configured like 1 rule, 1K, 10K rules For UDP correlated traffic following Key Performance Indicators are collected for every combination of test case parameters: - • RFC2544 throughput for various loss rate defined (1% is a default) + + - RFC2544 throughput for various loss rate defined (1% is a default) Graphical Overview ================== @@ -140,6 +172,7 @@ NSB Testing with yardstick framework facilitate performance testing of various VNFs provided. .. code-block:: console + +-----------+ | | +-----------+ | vPE | ->|TGen Port 0| @@ -156,6 +189,7 @@ VNFs provided. | Traffic | ->|TGen Port 1| | patterns | +-----------+ +-----------+ + Figure 1: Network Service - 2 server configuration @@ -167,9 +201,11 @@ run the nsb_install.sh with root privileges Run === -source ~/.bash_profile -cd <yardstick_repo>/yardstick/cmd -sudo -E ./NSBperf.py --vnf vpe --test tc_baremetal_rfc2544_ipv4_1flow_64B.yaml +:: + + source ~/.bash_profile + cd <yardstick_repo>/yardstick/cmd + sudo -E ./NSBperf.py --vnf vpe --test tc_baremetal_rfc2544_ipv4_1flow_64B.yaml Development Environment ======================= diff --git a/docs/testing/user/userguide/08-nsb_installation.rst b/docs/testing/user/userguide/12-nsb_installation.rst index a390bb7d7..0b0840029 100644 --- a/docs/testing/user/userguide/08-nsb_installation.rst +++ b/docs/testing/user/userguide/12-nsb_installation.rst @@ -9,10 +9,6 @@ Yardstick - NSB Testing -Installation Abstract -------- -Yardstick supports installation on Ubuntu 14.04 or via a Docker image. The -installation procedure on Ubuntu 14.04 or via the docker image are detailed in -the section below. - The Network Service Benchmarking (NSB) extends the yardstick framework to do VNF characterization and benchmarking in three different execution environments viz., bare metal i.e. native Linux environment, standalone virtual @@ -32,20 +28,30 @@ The steps needed to run Yardstick with NSB testing are: Prerequisites ------------- -Refer chapter 08-instalaltion.rst for more information on yardstick +Refer chapter Yardstick Instalaltion for more information on yardstick prerequisites Several prerequisites are needed for Yardstick(VNF testing): -* Python Modules: pyzmq, pika. -* flex -* bison -* build-essential -* automake -* libtool -* librabbitmq-dev -* rabbitmq-server -* collectd -* intel-cmt-cat + +- Python Modules: pyzmq, pika. + +- flex + +- bison + +- build-essential + +- automake + +- libtool + +- librabbitmq-dev + +- rabbitmq-server + +- collectd + +- intel-cmt-cat Installing Yardstick on Ubuntu 14.04 ------------------------------------ @@ -65,7 +71,7 @@ If you choose to use the Ubuntu 14.04 Docker image, You can pull the Ubuntu Installing Yardstick framework ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Download source code and install python dependencies: +Download source code and install Yardstick framework: :: @@ -73,7 +79,7 @@ Download source code and install python dependencies: cd yardstick ./nsb_setup.sh -It will automatically download all the packages needed for NSB Testing setup. +It will also automatically download all the packages needed for NSB Testing setup. System Topology: ----------------- @@ -95,19 +101,24 @@ OpenStack parameters and credentials Environment variables ^^^^^^^^^^^^^^^^^^^^^ + Before running Yardstick (NSB Testing) it is necessary to export traffic generator libraries. :: - source ~/.bash_profile + + source ~/.bash_profile Config yardstick conf ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -cp ./etc/yardstick/yardstick.conf.sample /etc/yardstick/yardstick.conf -vi /etc/yardstick/yardstick.conf +:: + + cp ./etc/yardstick/yardstick.conf.sample /etc/yardstick/yardstick.conf + vi /etc/yardstick/yardstick.conf + +Add trex_path and bin_path in 'nsb' section. -Config yardstick.conf :: [DEFAULT] @@ -128,10 +139,13 @@ Config yardstick.conf Config pod.yaml describing Topology ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + Before executing Yardstick test cases, make sure that pod.yaml reflects the topology and update all the required fields. -copy /etc/yardstick/nodes/pod.yaml.nsb.example to /etc/yardstick/nodes/pod.yaml +:: + + cp /etc/yardstick/nodes/pod.yaml.nsb.sample /etc/yardstick/nodes/pod.yaml Config pod.yaml :: @@ -202,6 +216,7 @@ Config pod.yaml Enable yardstick virtual environment ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + Before executing yardstick test cases, make sure to activate yardstick python virtual environment @@ -219,7 +234,7 @@ image can be found in glance and openrc file is sourced. Below is an example invocation of yardstick help command and ping.py test sample: :: - yardstick –h + yardstick -h yardstick task start samples/ping.yaml Each testing tool supported by Yardstick has a sample configuration file. diff --git a/docs/testing/user/userguide/images/Yardstick_framework_architecture_in_D.png b/docs/testing/user/userguide/images/Yardstick_framework_architecture_in_D.png Binary files differnew file mode 100644 index 000000000..f4065cb5e --- /dev/null +++ b/docs/testing/user/userguide/images/Yardstick_framework_architecture_in_D.png diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst index 1b963af61..a732fcc47 100644 --- a/docs/testing/user/userguide/index.rst +++ b/docs/testing/user/userguide/index.rst @@ -13,15 +13,15 @@ Performance Testing User Guide (Yardstick) 01-introduction 02-methodology 03-architecture - 04-vtc-overview - 05-apexlake_installation - 06-apexlake_api - 07-nsb-overview - 08-nsb_installation - 09-installation - 10-yardstick_plugin - 11-result-store-InfluxDB - 12-grafana + 04-installation + 05-yardstick_plugin + 06-result-store-InfluxDB + 07-grafana + 08-vtc-overview + 09-apexlake_installation + 10-apexlake_api + 11-nsb-overview + 12-nsb_installation 13-list-of-tcs glossary references diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc076.rst b/docs/testing/user/userguide/opnfv_yardstick_tc076.rst index ac7bde794..1e7647fa6 100644 --- a/docs/testing/user/userguide/opnfv_yardstick_tc076.rst +++ b/docs/testing/user/userguide/opnfv_yardstick_tc076.rst @@ -19,14 +19,20 @@ Yardstick Test Case Description TC076 | | TCP segment error rate and UDP datagram error rate | | | | +--------------+--------------------------------------------------------------+ -|test purpose | Monitor network metrics provided by the kernel in a host and | -| | calculate IP datagram error rate, ICMP message error rate, | -| | TCP segment error rate and UDP datagram error rate. | +|test purpose | The purpose of TC076 is to evaluate the IaaS network | +| | reliability with regards to IP datagram error rate, ICMP | +| | message error rate, TCP segment error rate and UDP datagram | +| | error rate. | | | | -+--------------+--------------------------------------------------------------+ -|configuration | file: opnfv_yardstick_tc076.yaml | +| | TC076 monitors network metrics provided by the Linux kernel | +| | in a host and calculates IP datagram error rate, ICMP | +| | message error rate, TCP segment error rate and UDP datagram | +| | error rate. | | | | -| | There is no additional configuration to be set for this TC. | +| | The purpose is also to be able to spot the trends. | +| | Test results, graphs and similar shall be stored for | +| | comparison reasons and product evolution understanding | +| | between different OPNFV versions and/or configurations. | | | | +--------------+--------------------------------------------------------------+ |test tool | nstat | @@ -34,6 +40,25 @@ Yardstick Test Case Description TC076 | | nstat is a simple tool to monitor kernel snmp counters and | | | network interface statistics. | | | | +| | (nstat is not always part of a Linux distribution, hence it | +| | needs to be installed. nstat is provided by the iproute2 | +| | collection, which is usually also the name of the package in | +| | many Linux distributions.As an example see the | +| | /yardstick/tools/ directory for how to generate a Linux | +| | image with iproute2 included.) | +| | | ++--------------+--------------------------------------------------------------+ +|test | Ping packets (ICMP protocol's mandatory ECHO_REQUEST | +|description | datagram) are sent from host VM to target VM(s) to elicit | +| | ICMP ECHO_RESPONSE. | +| | | +| | nstat is invoked on the target vm to monitors network | +| | metrics provided by the Linux kernel. | ++--------------+--------------------------------------------------------------+ +|configuration | file: opnfv_yardstick_tc076.yaml | +| | | +| | There is no additional configuration to be set for this TC. | +| | | +--------------+--------------------------------------------------------------+ |references | nstat man page | | | | @@ -43,19 +68,37 @@ Yardstick Test Case Description TC076 |applicability | This test case is mainly for monitoring network metrics. | | | | +--------------+--------------------------------------------------------------+ -|pre_test | | -|conditions | | +|pre_test | The test case image needs to be installed into Glance | +|conditions | with fio included in it. | +| | | +| | No POD specific requirements have been identified. | | | | +--------------+--------------------------------------------------------------+ |test sequence | description and expected result | | | | +--------------+--------------------------------------------------------------+ -|step 1 | The pod is available. | -| | Nstat is invoked and logs are produced and stored. | +|step 1 | Two host VMs are booted, as server and client. | +| | | ++--------------+--------------------------------------------------------------+ +|step 2 | Yardstick is connected with the server VM by using ssh. | +| | 'ping_benchmark' bash script is copyied from Jump Host to | +| | the server VM via the ssh tunnel. | +| | | ++--------------+--------------------------------------------------------------+ +|step 3 | Ping is invoked. Ping packets are sent from server VM to | +| | client VM. RTT results are calculated and checked against | +| | the SLA. nstat is invoked on the client vm to monitors | +| | network metrics provided by the Linux kernel. IP datagram | +| | error rate, ICMP message error rate, TCP segment error rate | +| | and UDP datagram error rate are calculated. | +| | Logs are produced and stored. | | | | | | Result: Logs are stored. | | | | +--------------+--------------------------------------------------------------+ +|step 4 | Two host VMs are deleted. | +| | | ++--------------+--------------------------------------------------------------+ |test verdict | None. | | | | +--------------+--------------------------------------------------------------+ diff --git a/requirements.txt b/requirements.txt index 3549f85e7..047ebf82d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,9 +8,9 @@ ############################################################################## appdirs==1.4.0 -Babel==2.2.0 +Babel==2.3.4 backport-ipaddress==0.1 -cliff==2.0.0 +cliff==2.3.0 cmd2==0.6.8 coverage==4.1b2 debtcollector==1.3.0 @@ -26,7 +26,7 @@ Jinja2==2.8 jsonpatch==1.13 jsonpointer==1.10 jsonschema==2.5.1 -keystoneauth1==2.3.0 +keystoneauth1==2.18.0 linecache2==1.0.0 lxml==3.5.0 MarkupSafe==0.23 @@ -38,16 +38,16 @@ msgpack-python==0.4.7 netaddr==0.7.18 netifaces==0.10.4 nose==1.3.7 -openstacksdk==0.8.1 +openstacksdk==0.9.13 os-client-config==1.22.0 -oslo.config==3.9.0 +oslo.config==3.14.0 oslo.i18n==3.4.0 oslo.serialization==2.4.0 -oslo.utils==3.7.0 +oslo.utils==3.18.0 paramiko==1.18.0 pbr==1.8.1 pep8==1.7.0 -positional==1.0.1 +positional==1.1.1 prettytable==0.7.2 pycrypto==2.6.1 pyflakes==1.0.0 @@ -57,11 +57,11 @@ osc-lib==1.2.0 python-cinderclient==1.9.0 python-glanceclient==2.5.0 python-heatclient==1.5.0 -python-keystoneclient==3.6.0 +python-keystoneclient==3.8.0 python-mimeparse==1.5.1 python-neutronclient==6.0.0 python-novaclient==6.0.0 -python-openstackclient==3.7.0 +python-openstackclient==3.8.0 python-subunit==1.2.0 python-swiftclient==3.0.0 pytz==2015.7 @@ -71,7 +71,7 @@ requestsexceptions==1.1.3 scp==0.10.2 simplejson==3.8.2 six==1.10.0 -stevedore==1.12.0 +stevedore==1.17.1 testrepository==0.0.20 testtools==2.0.0 traceback2==1.4.0 diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh index fa4a54df6..3579909c5 100755 --- a/tests/ci/clean_images.sh +++ b/tests/ci/clean_images.sh @@ -20,7 +20,7 @@ cleanup() fi for image in $(openstack image list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \ - -e yardstick-vivid-kernel | awk '{print $2}'); do + | awk '{print $2}'); do echo "Deleting image $image..." openstack image delete $image || true done diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index f81ee1b26..a326458a9 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -15,26 +15,27 @@ set -e YARD_IMG_ARCH=amd64 export YARD_IMG_ARCH -HW_FW_TYPE="" -if [ "${YARD_IMG_ARCH}" = "arm64" ]; then - HW_FW_TYPE=uefi -fi -export HW_FW_TYPE - if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then - sudo echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" >> /etc/sudoers + echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" | sudo tee -a /etc/sudoers fi -ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch" +# Look for a compute node, that is online, and check if it is aarch64 +ARCH_SCRIPT="ssh \$(fuel2 node list | awk -F'|' '\$6 ~ /compute/ && \$11 ~ /rue/ {print \$7; exit;}') uname -m 2>/dev/null | grep -q aarch64" if [ "$INSTALLER_TYPE" == "fuel" ]; then - sshpass -p r00tme ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root $INSTALLER_IP "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64 + sshpass -p r00tme ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root "${INSTALLER_IP}" "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64 fi +HW_FW_TYPE="" +if [ "${YARD_IMG_ARCH}" == "arm64" ]; then + HW_FW_TYPE=uefi +fi +export HW_FW_TYPE + UCA_HOST="cloud-images.ubuntu.com" if [ "${YARD_IMG_ARCH}" == "arm64" ]; then export CLOUD_IMG_URL="http://${UCA_HOST}/${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz" if ! grep -q "Defaults env_keep += \"CLOUD_IMG_URL\"" "/etc/sudoers"; then - sudo echo "Defaults env_keep += \"CLOUD_IMG_URL\"" >> /etc/sudoers + echo "Defaults env_keep += \"CLOUD_IMG_URL\"" | sudo tee -a /etc/sudoers fi fi @@ -44,22 +45,24 @@ build_yardstick_image() echo "========== Build yardstick cloud image ==========" if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then - local cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh" + local cmd + cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh" # Build the image. Retry once if the build fails $cmd || $cmd - if [ ! -f $RAW_IMAGE ]; then + if [ ! -f "${RAW_IMAGE}" ]; then echo "Failed building RAW image" exit 1 fi else - local cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh" + local cmd + cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh" # Build the image. Retry once if the build fails $cmd || $cmd - if [ ! -f $QCOW_IMAGE ]; then + if [ ! -f "${QCOW_IMAGE}" ]; then echo "Failed building QCOW image" exit 1 fi @@ -71,24 +74,24 @@ load_yardstick_image() echo echo "========== Loading yardstick cloud image ==========" EXTRA_PARAMS="" - if [[ "${YARD_IMG_ARCH}" = "arm64" && "${YARD_IMG_AKI}" = "true" ]]; then + if [[ "${YARD_IMG_ARCH}" == "arm64" && "${YARD_IMG_AKI}" == "true" ]]; then CLOUD_IMAGE="/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz" CLOUD_KERNEL="/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}-vmlinuz-generic" cd /tmp if [ ! -f "${CLOUD_IMAGE}" ]; then - wget $CLOUD_IMG_URL + wget "${CLOUD_IMG_URL}" fi if [ ! -f "${CLOUD_KERNEL}" ]; then - tar zxf $CLOUD_IMAGE $(basename $CLOUD_KERNEL) + tar xf "${CLOUD_IMAGE}" "${CLOUD_KERNEL##**/}" fi create_kernel=$(openstack image create \ --public \ --disk-format qcow2 \ --container-format bare \ - --file $CLOUD_KERNEL \ + --file ${CLOUD_KERNEL} \ yardstick-${release}-kernel) - GLANCE_KERNEL_ID=$(echo "$create_kernel" | grep " id " | awk '{print $(NF-1)}') + GLANCE_KERNEL_ID=$(echo "$create_kernel" | awk '/ id / {print $(NF-1)}') if [ -z "$GLANCE_KERNEL_ID" ]; then echo 'Failed uploading kernel to cloud'. exit 1 @@ -98,8 +101,8 @@ load_yardstick_image() EXTRA_PARAMS="--property kernel_id=$GLANCE_KERNEL_ID --property os_command_line=\"$command_line\"" - rm -f $CLOUD_KERNEL $CLOUD_IMAGE - cd $YARDSTICK_REPO_DIR + rm -f -- "${CLOUD_KERNEL}" "${CLOUD_IMAGE}" + cd "${YARDSTICK_REPO_DIR}" fi # VPP requires guest memory to be backed by large pages @@ -114,18 +117,18 @@ load_yardstick_image() if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then output=$(eval openstack image create \ --public \ - --disk-format root-tar \ + --disk-format raw \ --container-format bare \ - $EXTRA_PARAMS \ - --file $RAW_IMAGE \ + ${EXTRA_PARAMS} \ + --file ${RAW_IMAGE} \ yardstick-image) else output=$(eval openstack image create \ --public \ --disk-format qcow2 \ --container-format bare \ - $EXTRA_PARAMS \ - --file $QCOW_IMAGE \ + ${EXTRA_PARAMS} \ + --file ${QCOW_IMAGE} \ yardstick-image) fi @@ -138,10 +141,10 @@ load_yardstick_image() exit 1 fi - if [ "$DEPLOY_SCENARIO" == *"-lxd-"* ]; then - sudo rm -f $RAW_IMAGE + if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then + sudo rm -f -- "${RAW_IMAGE}" else - sudo rm -f $QCOW_IMAGE + sudo rm -f -- "${QCOW_IMAGE}" fi echo "Glance image id: $GLANCE_IMAGE_ID" @@ -163,8 +166,8 @@ load_cirros_image() output=$(openstack image create \ --disk-format qcow2 \ --container-format bare \ - $EXTRA_PARAMS \ - --file $image_file \ + ${EXTRA_PARAMS} \ + --file ${image_file} \ cirros-0.3.3) echo "$output" @@ -233,12 +236,12 @@ main() build_yardstick_image load_yardstick_image - if [ "${YARD_IMG_ARCH}" = "arm64" ]; then - sed -i 's/image: cirros-0.3.3/image: TestVM/g' tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml \ - samples/ping.yaml + if [ "${YARD_IMG_ARCH}" == "arm64" ]; then + sed -i 's/image: {{image}}/image: TestVM/g' tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml + sed -i 's/image: cirros-0.3.3/image: TestVM/g' samples/ping.yaml #We have overlapping IP with the real network for filename in tests/opnfv/test_cases/*; do - sed -i "s/cidr: '10.0.1.0\/24'/cidr: '10.3.1.0\/24'/g" $filename + sed -i "s/cidr: '10.0.1.0\/24'/cidr: '10.3.1.0\/24'/g" "${filename}" done else load_cirros_image diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-ha_daily.yaml new file mode 100644 index 000000000..c629445e4 --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-ha_daily.yaml @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# os-nosdn-fdio-ha daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-nosdn-fdio-ha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc002.yaml +- + file_name: opnfv_yardstick_tc005.yaml +- + file_name: opnfv_yardstick_tc010.yaml +- + file_name: opnfv_yardstick_tc011.yaml +- + file_name: opnfv_yardstick_tc012.yaml +- + file_name: opnfv_yardstick_tc014.yaml +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc069.yaml +- + file_name: opnfv_yardstick_tc070.yaml +- + file_name: opnfv_yardstick_tc071.yaml +- + file_name: opnfv_yardstick_tc072.yaml diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-fdio-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-fdio-noha_daily.yaml new file mode 100644 index 000000000..3d9efe74b --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-fdio-noha_daily.yaml @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# os-odl_l3-fdio-noha daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-odl_l3-fdio-noha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc002.yaml +- + file_name: opnfv_yardstick_tc005.yaml +- + file_name: opnfv_yardstick_tc010.yaml +- + file_name: opnfv_yardstick_tc011.yaml +- + file_name: opnfv_yardstick_tc012.yaml +- + file_name: opnfv_yardstick_tc014.yaml +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc069.yaml +- + file_name: opnfv_yardstick_tc070.yaml +- + file_name: opnfv_yardstick_tc071.yaml +- + file_name: opnfv_yardstick_tc072.yaml diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh index bffd83a7b..4b0c07a5b 100755 --- a/tools/ubuntu-server-cloudimg-modify.sh +++ b/tools/ubuntu-server-cloudimg-modify.sh @@ -46,17 +46,6 @@ chpasswd: { expire: False } ssh_pwauth: True EOF apt-get update -if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then - apt-get install -y \ - linux-headers-$(echo $CLOUD_KERNEL_VERSION | cut -d'-' -f3,4,5) \ - unzip - #resize root partition (/dev/vdb1) It is supposed to be default but the image is booted differently for arm64 -cat <<EOF >/etc/cloud/cloud.cfg.d/15_growpart.cfg -#cloud-config -bootcmd: - - [growpart, /dev/vdb, 1] -EOF -fi apt-get install -y \ bc \ fio \ @@ -81,37 +70,17 @@ CLONE_DEST=/opt/tempT # remove before cloning rm -rf -- "${CLONE_DEST}" -if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then - wget https://github.com/kdlucas/byte-unixbench/archive/master.zip - unzip master.zip && rm master.zip - mkdir "${CLONE_DEST}" - mv byte-unixbench-master/UnixBench "${CLONE_DEST}" - sed -i -e 's/OPTON += -march=native -mtune=native/OPTON += -march=armv8-a -mtune=generic/g' \ - -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' "${CLONE_DEST}/UnixBench/Makefile" -else - git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}" -fi +git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}" + make --directory "${CLONE_DEST}/UnixBench/" -if [ "${YARD_IMG_ARCH}" = "arm64" ]; then - wget https://github.com/beefyamoeba5/ramspeed/archive/master.zip - unzip master.zip && rm master.zip - mkdir "${CLONE_DEST}/RAMspeed" - mv ramspeed-master/* "${CLONE_DEST}/RAMspeed/" -else - git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed" -fi +git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed" + cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0" mkdir temp bash build.sh -if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then - wget https://github.com/beefyamoeba5/cachestat/archive/master.zip - unzip master.zip && rm master.zip - mv cachestat-master/cachestat "${CLONE_DEST}" -else - git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat" -fi +git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat" # restore symlink ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf diff --git a/tools/yardstick-img-dpdk-modify b/tools/yardstick-img-dpdk-modify index ec2672d27..9f3d11957 100644 --- a/tools/yardstick-img-dpdk-modify +++ b/tools/yardstick-img-dpdk-modify @@ -44,8 +44,8 @@ host=${HOST:-"cloud-images.ubuntu.com"} release=${RELEASE:-"wily"} image_path="${release}/current/${release}-server-cloudimg-amd64-disk1.img" image_url=${IMAGE_URL:-"https://${host}/${image_path}"} -md5sums_path="${release}/current/MD5SUMS" -md5sums_url=${MD5SUMS_URL:-"https://${host}/${md5sums_path}"} +sha256sums_path="${release}/current/SHA256SUMS" +sha256sums_url=${SHA256SUMS_URL:-"https://${host}/${sha256sums_path}"} imgfile="${workspace}/yardstick-${release}-server" raw_imgfile="${workspace}/yardstick-${release}-server.raw" @@ -55,14 +55,14 @@ filename=$(basename $image_url) download() { test -d $workspace || mkdir -p $workspace cd $workspace - rm -f MD5SUMS # always download the checksum file to a detect stale image - wget $md5sums_url + rm -f SHA256SUMS # always download the checksum file to a detect stale image + wget $sha256sums_url test -e $filename || wget -nc $image_url - grep $filename MD5SUMS | md5sum -c || + grep $filename SHA256SUMS | sha256sum -c || if [ $? -ne 0 ]; then rm $filename wget -nc $image_url - grep $filename MD5SUMS | md5sum -c + grep $filename SHA256SUMS | sha256sum -c fi qemu-img convert $filename $raw_imgfile cd - diff --git a/tools/yardstick-img-lxd-modify b/tools/yardstick-img-lxd-modify index 4ca4eb489..b977d2a52 100755 --- a/tools/yardstick-img-lxd-modify +++ b/tools/yardstick-img-lxd-modify @@ -44,8 +44,8 @@ host=${HOST:-"cloud-images.ubuntu.com"} release=${RELEASE:-"xenial"} image_path="${release}/current/${release}-server-cloudimg-amd64-root.tar.gz" image_url=${IMAGE_URL:-"https://${host}/${image_path}"} -md5sums_path="${release}/current/MD5SUMS" -md5sums_url=${MD5SUMS_URL:-"https://${host}/${md5sums_path}"} +sha256sums_path="${release}/current/SHA256SUMS" +sha256sums_url=${SHA256SUMS_URL:-"https://${host}/${sha256sums_path}"} imgfile="${workspace}/yardstick-image.tar.gz" filename=$(basename $image_url) @@ -54,14 +54,14 @@ filename=$(basename $image_url) download() { test -d $workspace || mkdir -p $workspace cd $workspace - rm -f MD5SUMS # always download the checksum file to a detect stale image - wget $md5sums_url + rm -f SHA256SUMS # always download the checksum file to a detect stale image + wget $sha256sums_url test -e $filename || wget -nc --progress=dot:giga $image_url - grep $filename MD5SUMS | md5sum -c || + grep $filename SHA256SUMS | sha256sum -c || if [ $? -ne 0 ]; then rm $filename wget -nc --progress=dot:giga $image_url - grep $filename MD5SUMS | md5sum -c + grep $filename SHA256SUMS | sha256sum -c fi cd - } diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify index b4f632bb2..599768555 100755 --- a/tools/yardstick-img-modify +++ b/tools/yardstick-img-modify @@ -48,8 +48,8 @@ fi image_path="${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}-${boot_mode}.img" image_url=${IMAGE_URL:-"https://${host}/${image_path}"} -md5sums_path="${release}/current/MD5SUMS" -md5sums_url=${MD5SUMS_URL:-"https://${host}/${md5sums_path}"} +sha256sums_path="${release}/current/SHA256SUMS" +sha256sums_url=${SHA256SUMS_URL:-"https://${host}/${sha256sums_path}"} imgfile="${workspace}/yardstick-image.img" raw_imgfile_basename="yardstick-${release}-server.raw" @@ -62,41 +62,20 @@ apt-get install -y parted download() { test -d $workspace || mkdir -p $workspace cd $workspace - rm -f MD5SUMS # always download the checksum file to a detect stale image - wget $md5sums_url + rm -f SHA256SUMS # always download the checksum file to a detect stale image + wget $sha256sums_url test -e $filename || wget -nc --progress=dot:giga $image_url - grep $filename MD5SUMS | md5sum -c || + grep $filename SHA256SUMS | sha256sum -c || if [ $? -ne 0 ]; then rm $filename wget -nc --progress=dot:giga $image_url - grep $filename MD5SUMS | md5sum -c + grep $filename SHA256SUMS | sha256sum -c fi for i in $(seq 0 9); do [ -a /dev/loop$i ] || mknod -m 660 /dev/loop$i b 7 $i done - if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then - cd /tmp - if [ ! -f /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt ]; then - wget http://${host}/${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt - fi - export CLOUD_KERNEL_VERSION=$(cut -d$'\t' -f4 ${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt) - - mkdir -p /tmp/${release}-modules - if [ ! -f "/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz" ]; then - wget $CLOUD_IMG_URL - fi - if [ ! -f "/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img" ]; then - tar zxvf ${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz ${release}-server-cloudimg-${YARD_IMG_ARCH}.img - fi - mkdir -p /mnt/${release} - mount /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img /mnt/${release} - cp -r /mnt/${release}/lib/modules/$(echo $CLOUD_KERNEL_VERSION) /tmp/${release}-modules - umount /mnt/${release} - rm /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img - cd $workspace - fi qemu-img convert $filename $raw_imgfile cd - } @@ -104,19 +83,12 @@ download() { # mount image setup() { # qemu-img resize $raw_imgfile +5GB - if [ "${YARD_IMG_ARCH}" = "arm64" ]; then - echo -e "d\nn\np\n1\n\n\nw" | parted -l $raw_imgfile - fi mkdir -p $mountdir loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ') kpartx -av $raw_imgfile - if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then - e2fsck -p -f /dev/mapper/$loopdevice - resize2fs /dev/mapper/$loopdevice - fi # for trouble shooting sleep 2 dmsetup ls @@ -124,11 +96,10 @@ setup() { mount /dev/mapper/$loopdevice $mountdir mount -t proc none $mountdir/proc - if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then - cp -r /tmp/${release}-modules/$(echo $CLOUD_KERNEL_VERSION) "$mountdir/lib/modules" - cp $(which "qemu-aarch64-static") "$mountdir/usr/bin" - fi cp $cmd $mountdir/$(basename $cmd) + if [ "${YARD_IMG_ARCH}" = "arm64" ]; then + cp /usr/bin/qemu-aarch64-static $mountdir/usr/bin + fi } # modify image running a script using in a chrooted environment diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py index 2794d84f4..47315b587 100644 --- a/yardstick/benchmark/core/task.py +++ b/yardstick/benchmark/core/task.py @@ -220,7 +220,6 @@ class Task(object): # pragma: no cover target_attr: either a name for a server created by yardstick or a dict with attribute name mapping when using external heat templates """ - return True host = None target = None for context in self.contexts: |
