5 files changed, 79 insertions, 42 deletions
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/infra_create_network/tasks/create_xml.yml b/ansible/roles/infra_create_network/tasks/create_xml.yml
index 1632e591c..345b77927 100644
--- a/ansible/roles/infra_create_network/tasks/create_xml.yml
+++ b/ansible/roles/infra_create_network/tasks/create_xml.yml
@@ -42,8 +42,13 @@
       - name: "{{ item.name }}"
       - forward:
           mode: nat
-      - bridge
-      - ip
+      - bridge:
+          name: "{{ item.name }}"
+          stp: "on"
+          delay: "0"
+      - ip:
+          address: "{{ item.host_ip }}"
+          netmask: "{{ item.netmask }}"
     pretty_print: yes
 
 - name: Add new children nodes to "forward" node
@@ -64,46 +69,6 @@
           end: "65535"
     pretty_print: yes
 
-- name: Add "name" attribute to "bridge" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/bridge
-    attribute: name
-    value: "{{ item.name }}"
-    pretty_print: yes
-
-- name: Add "stp" attribute to "bridge" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/bridge
-    attribute: stp
-    value: "on"
-    pretty_print: yes
-
-- name: Add "delay" attribute to "bridge" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/bridge
-    attribute: delay
-    value: "0"
-    pretty_print: yes
-
-- name: Add "address" attribute to "ip" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/ip
-    attribute: address
-    value: "{{ item.host_ip }}"
-    pretty_print: yes
-
-- name: Add "netmask" attribute to "ip" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/ip
-    attribute: netmask
-    value: "{{ item.netmask }}"
-    pretty_print: yes
-
 - name: Define the networks
   virt_net:
     command: define
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 }}"