summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/install.yaml37
-rw-r--r--ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml6
-rwxr-xr-xansible/roles/install_dependencies_jumphost/tasks/Debian.yml10
-rw-r--r--ansible/roles/install_image_dependencies/defaults/main.yml1
-rw-r--r--yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py4
-rw-r--r--yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py4
6 files changed, 50 insertions, 12 deletions
diff --git a/ansible/install.yaml b/ansible/install.yaml
index f4f57bdc0..d181c5ffd 100644
--- a/ansible/install.yaml
+++ b/ansible/install.yaml
@@ -100,9 +100,12 @@
- install_pmu_tools
- download_collectd
- install_collectd
+ - docker
+ - barometer_collectd
-- hosts: jumphost
+- name: Prepare to build VM
+ hosts: jumphost
become: yes
vars:
img_prop_item: "{{ IMG_PROPERTY }}"
@@ -116,7 +119,8 @@
when: installation_mode != inst_mode_container
-- hosts: chroot_image
+- name: Build VM in chroot
+ hosts: chroot_image
connection: chroot
become: yes
vars:
@@ -131,7 +135,8 @@
when: installation_mode != inst_mode_container
-- hosts: jumphost
+- name: Clear up after VM is built
+ hosts: jumphost
become: yes
tasks:
@@ -142,11 +147,33 @@
when: installation_mode != inst_mode_container
-- name: start yardstick container on jumphost
+- hosts: jumphost
+ vars_files:
+ - yardstick_config.yml
+
+ roles:
+ - { role: convert_openrc, when: openrc_file is defined }
+
+
+- name: Add OpenStack variables, image
+ hosts: jumphost
+ vars_files:
+ - yardstick_config.yml
+ environment:
+ "{{ openrc }}"
+
+ roles:
+ - { role: clean_images, when: openrc_file is defined }
+ - { role: clean_flavors, when: openrc_file is defined }
+ - { role: create_samplevnfs_image, when: openrc_file is defined }
+
+
+- name: Start yardstick container on jumphost
hosts: jumphost
tasks:
- - include_role:
+ - name: Install docker needed to pull Yardstick container
+ include_role:
name: docker
when: installation_mode == inst_mode_container_pull
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 c2f72cada..c9e386346 100644
--- a/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
+++ b/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
@@ -72,6 +72,9 @@
loop_var: role_item
environment: "{{ proxy_env }}"
+- include_vars: roles/install_dpdk/defaults/main.yml
+ when: INSTALL_BIN_PATH is undefined
+
- name: Install PROX
include_role:
name: install_samplevnf
@@ -89,9 +92,6 @@
loop_var: role_item
environment: "{{ proxy_env }}"
-- include_vars: roles/install_dpdk/defaults/main.yml
- when: INSTALL_BIN_PATH is undefined
-
- include_vars: roles/download_samplevnfs/defaults/main.yml
when: samplevnf_dest is undefined
- set_fact:
diff --git a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
index 6c3900d26..a229cc1a2 100755
--- a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
+++ b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
@@ -91,8 +91,16 @@
- ansible_distribution == 'Ubuntu'
- ansible_distribution_major_version|int >= 17
+- name: Uninstall docker as it conflicts with docker-py
+ pip:
+ name:
+ - docker
+ state: absent
+
- name: Install required docker-py module
pip:
- name: docker-py
+ name:
+ - docker-py
+ - shade
state: latest
environment: "{{ proxy_env }}"
diff --git a/ansible/roles/install_image_dependencies/defaults/main.yml b/ansible/roles/install_image_dependencies/defaults/main.yml
index 7a3f5fa7e..42951bf6d 100644
--- a/ansible/roles/install_image_dependencies/defaults/main.yml
+++ b/ansible/roles/install_image_dependencies/defaults/main.yml
@@ -29,6 +29,7 @@ install_dependencies:
- libxft-dev
- libxss-dev
- expect
+ - libnuma-dev
RedHat:
- bc
- fio
diff --git a/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py b/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
index 6645d45fe..d41dd028f 100644
--- a/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
+++ b/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
@@ -1038,7 +1038,7 @@ class IxNextgen(object): # pragma: no cover
return obj
- def add_static_ipv4(self, iface, vport, start_ip, count):
+ def add_static_ipv4(self, iface, vport, start_ip, count, mask='24'):
"""Add static IP range to the interface"""
log.debug("add_static_ipv4: start_ip:'%s', count:'%s'",
start_ip, count)
@@ -1046,5 +1046,5 @@ class IxNextgen(object): # pragma: no cover
self.ixnet.setMultiAttribute(obj, '-protocolInterface', iface,
'-ipStart', start_ip, '-count', count,
- '-enabled', 'true')
+ '-mask', mask, '-enabled', 'true')
self.ixnet.commit()
diff --git a/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py b/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
index c1d902061..5b32a4297 100644
--- a/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
+++ b/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
@@ -373,13 +373,15 @@ class TestIxNextgen(unittest.TestCase):
self.ixnet_gen.add_static_ipv4(iface='iface',
vport='vport',
start_ip='10.0.0.0',
- count='100')
+ count='100',
+ mask='32')
self.ixnet_gen.ixnet.add.assert_called_once_with(
'vport/protocols/static', 'ip')
self.ixnet_gen.ixnet.setMultiAttribute.assert_any_call(
'obj', '-protocolInterface', 'iface',
'-ipStart', '10.0.0.0',
'-count', '100',
+ '-mask', '32',
'-enabled', 'true')
@mock.patch.object(IxNetwork, 'IxNet')