Merge "Remove share02 and share03 nodes"
diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index 5abb84e..50f934e 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -34,6 +34,7 @@
container_name = 'run-tempest-ci'
master_host = "cfg01"
control_host = "ctl01"
+ compute_host = "cmp"
class_name = "runtest"
run_cmd = '/bin/bash -c "run-tempest"'
@@ -54,6 +55,8 @@
self.master_host)[0]
self.control_name = self.underlay.get_target_node_names(
self.control_host)[0]
+ self.compute_name = self.underlay.get_target_node_names(
+ self.compute_host)[0]
@property
def salt_api(self):
@@ -178,14 +181,22 @@
indent=4, sort_keys=True)
f.write(container_inspect)
- def prepare(self, dpdk=None):
+ def prepare(self):
self.store_runtest_model()
cirros_pillar = ("salt-call --out=newline_values_only "
"pillar.get "
"glance:client:identity:"
"admin_identity:image:cirros:location")
+ dpdk_pillar = "linux:network:dpdk:enabled"
salt_cmd = "salt -l info --hard-crash --state-output=mixed "
salt_call_cmd = "salt-call -l info --hard-crash --state-output=mixed "
+
+ result = self.__salt_api.get_pillar(tgt=self.compute_name,
+ pillar=dpdk_pillar)
+
+ dpdk = result[0].get(self.compute_name, False)
+ LOG.info("DPDK enabled: {}".format(bool(dpdk)))
+
commands = [
{
'description': "Sync salt objects for runtest model",
@@ -338,12 +349,12 @@
return {'inspect': inspect,
'logs': logs}
- def prepare_and_run_tempest(self, username='root', dpdk=None):
+ def prepare_and_run_tempest(self, username='root'):
"""
Run tempest tests
"""
tempest_timeout = settings.TEMPEST_TIMEOUT
- self.prepare(dpdk=dpdk)
+ self.prepare()
test_res = self.run_tempest(tempest_timeout)
self.fetch_arficats(username=username)
self.save_runtime_logs(**test_res)
diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml
index 8b0bd00..e4c5fbd 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml
@@ -141,7 +141,7 @@
openstack_nfv_sriov_enabled: 'False'
openstack_nova_compute_hugepages_count: '2048'
openstack_nova_compute_nfv_req_enabled: 'False'
- openstack_nova_cpu_pinning: '3'
+ openstack_nova_cpu_pinning: '4,5,8,9,10,11'
openstack_ovs_dvr_enabled: 'False'
openstack_ovs_encapsulation_type: vxlan
openstack_proxy_address: 10.167.4.80
diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
index cd95ec0..467680e 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
@@ -221,7 +221,10 @@
ens4:
role: single_ctl
ens5:
- role: single_ovs_br_prv
- mtu: 1500
+ role: bond0_ab_ovs_vxlan_mesh_no_tag
+ ens6:
+ role: bond0_ab_ovs_vxlan_mesh_no_tag
ens7:
- role: bond1_ab_ovs_floating
+ role: single_ovs_br_floating
+ external_address: 10.90.0.110
+ external_network_netmask: 255.255.255.0
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-pike-dpdk.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-pike-dpdk.yaml
index d2ed4e9..293980a 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-pike-dpdk.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-pike-dpdk.yaml
@@ -25,7 +25,9 @@
sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
# set wider cpu mask for DPDK
- salt-call reclass.cluster_meta_set name='compute_ovs_dpdk_lcore_mask' value='"0xF"' file_name=/srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/init.yml
+ salt-call reclass.cluster_meta_set name='compute_ovs_dpdk_lcore_mask' value='"0x41"' file_name=/srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/init.yml
+ salt-call reclass.cluster_meta_set name='compute_ovs_pmd_cpu_mask' value='"0xe"' file_name=/srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/init.yml
+ salt-call reclass.cluster_meta_set name='compute_ovs_dpdk_socket_mem' value='"512,512"' file_name=/srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/init.yml
salt-call reclass.cluster_meta_set name='compute_hugepages_size' value='"2M"' file_name=/srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/init.yml
salt-call reclass.cluster_meta_set name='compute_hugepages_mount' value='"/mnt/hugepages_2M"' file_name=/srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/init.yml
diff --git a/tcp_tests/tests/system/test_install_mcp_ovs_pike.py b/tcp_tests/tests/system/test_install_mcp_ovs_pike.py
index 98d9498..7e726cb 100644
--- a/tcp_tests/tests/system/test_install_mcp_ovs_pike.py
+++ b/tcp_tests/tests/system/test_install_mcp_ovs_pike.py
@@ -229,7 +229,7 @@
args='service ntp stop; ntpd -gq; service ntp start')
if settings.RUN_TEMPEST:
- tempest_actions.prepare_and_run_tempest(dpdk=True)
+ tempest_actions.prepare_and_run_tempest()
LOG.info("*************** DONE **************")
@pytest.mark.grab_versions
@@ -298,7 +298,7 @@
tgt='*', fun='cmd.run',
args='service ntp stop; ntpd -gq; service ntp start')
if settings.RUN_TEMPEST:
- tempest_actions.prepare_and_run_tempest(dpdk=True)
+ tempest_actions.prepare_and_run_tempest()
LOG.info("*************** DONE **************")