From f8ab820a1890ca091d14e9bbf4efd700744be093 Mon Sep 17 00:00:00 2001
From: liyin <liyin11@huawei.com>
Date: Sun, 18 Mar 2018 14:51:19 +0000
Subject: TC042 bug fix

JIRA:YARDSTICK-786

yardstick DPDK image have problems to build.
We will fix this by using nsb image
the pktgen DPDK testcase will use sampleVNF image

Change-Id: I24b7b6a9acfe21ec956fa9c4ee7ebe7ae1787dbb
Signed-off-by: liyin <liyin11@huawei.com>
---
 ansible/roles/download_pktgen/defaults/main.yml    |  8 +++++
 ansible/roles/download_pktgen/tasks/main.yml       | 38 ++++++++++++++++++++++
 .../install_image_dependencies/defaults/main.yml   |  1 +
 ansible/roles/install_pktgen/tasks/main.yml        | 25 ++++++++++++++
 .../ubuntu_server_cloudimg_modify_samplevnfs.yml   |  2 ++
 5 files changed, 74 insertions(+)
 create mode 100644 ansible/roles/download_pktgen/defaults/main.yml
 create mode 100644 ansible/roles/download_pktgen/tasks/main.yml
 create mode 100644 ansible/roles/install_pktgen/tasks/main.yml

(limited to 'ansible')

diff --git a/ansible/roles/download_pktgen/defaults/main.yml b/ansible/roles/download_pktgen/defaults/main.yml
new file mode 100644
index 000000000..b598e1d56
--- /dev/null
+++ b/ansible/roles/download_pktgen/defaults/main.yml
@@ -0,0 +1,8 @@
+---
+pktgen_version: "3.2.12"
+pktgen_url: "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-{{ pktgen_version }}.zip"
+pktgen_file: "{{ pktgen_url|basename }}"
+pktgen_unarchive: "{{ pktgen_file|regex_replace('[.]zip$', '') }}"
+pktgen_dest: "{{ clone_dest }}/"
+pktgen_sha256s:
+  "3.2.12": "sha256:a20aeb677fb847c0871acabb6e8f965ba3485e92f92e86e0bb5dc11c787b11d8"
diff --git a/ansible/roles/download_pktgen/tasks/main.yml b/ansible/roles/download_pktgen/tasks/main.yml
new file mode 100644
index 000000000..ff71f207d
--- /dev/null
+++ b/ansible/roles/download_pktgen/tasks/main.yml
@@ -0,0 +1,38 @@
+# Copyright (c) 2018 Huawei Technologies Co.,Ltd and others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+- file:
+    path: "{{ pktgen_dest }}"
+    state: directory
+
+- name: fetch pktgen
+  get_url:
+    url: "{{ pktgen_url }}"
+    dest: "{{ pktgen_dest }}"
+    validate_certs: False
+    checksum: "{{ pktgen_sha256s[pktgen_version] }}"
+
+- unarchive:
+    src: "{{ pktgen_dest }}/{{ pktgen_file }}"
+    dest: "{{ pktgen_dest }}/"
+    copy: no
+
+- name: cleanup tar file to save space
+  file:
+      path: "{{ pktgen_dest }}/{{ pktgen_file }}"
+      state: absent
+
+- set_fact:
+    pktgen_path: "{{ pktgen_dest }}/{{ pktgen_unarchive }}"
+
diff --git a/ansible/roles/install_image_dependencies/defaults/main.yml b/ansible/roles/install_image_dependencies/defaults/main.yml
index f0b53215a..7a3f5fa7e 100644
--- a/ansible/roles/install_image_dependencies/defaults/main.yml
+++ b/ansible/roles/install_image_dependencies/defaults/main.yml
@@ -28,6 +28,7 @@ install_dependencies:
     # for IxLoad
     - libxft-dev
     - libxss-dev
+    - expect
   RedHat:
     - bc
     - fio
diff --git a/ansible/roles/install_pktgen/tasks/main.yml b/ansible/roles/install_pktgen/tasks/main.yml
new file mode 100644
index 000000000..294c77971
--- /dev/null
+++ b/ansible/roles/install_pktgen/tasks/main.yml
@@ -0,0 +1,25 @@
+# Copyright (c) 2018 Huawei Technologies Co.,Ltd and others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+- name: set build env vars
+  set_fact:
+      build_env_vars:
+        RTE_SDK: "{{ RTE_SDK }}"
+        RTE_TARGET: "{{ RTE_TARGET }}"
+
+- name: "make pktgen"
+  command: make
+  args:
+    chdir: "{{ pktgen_path }}"
+  environment: "{{ build_env_vars }}"
diff --git a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
index 85afa2a30..7aa6c8c12 100644
--- a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
+++ b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
@@ -40,6 +40,8 @@
     - install_dpdk
     - download_trex
     - install_trex
+    - download_pktgen
+    - install_pktgen
     - download_civetweb
     - install_civetweb
     - download_samplevnfs
-- 
cgit 1.2.3-korg