WIP Add configuration specific resources
Change-Id: Idcea965d33779d4b8eb62f60f43b2e33b7fd8bf0
diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index 5411881..b24cba2 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -134,6 +134,14 @@
def create_flavors(self):
return self.salt_api.local('cfg01*', 'state.sls', 'nova.client')
+ def set_property(self):
+ return self.salt_api.local(
+ tgt='ctl01*',
+ fun='cmd.run',
+ args='. /root/keystonercv3; openstack '
+ 'flavor set m1.tiny_test '
+ '--property hw:mem_page_size=small')
+
def create_cirros(self):
return self.salt_api.local('cfg01*', 'state.sls', 'glance.client')
@@ -198,7 +206,7 @@
indent=4, sort_keys=True)
f.write(container_inspect)
- def prepare(self):
+ def prepare(self, dpdk=None):
self.store_runtest_model()
res = self.install_python_lib()
@@ -215,6 +223,11 @@
res = self.create_flavors()
LOG.info(json.dumps(res, indent=4))
time.sleep(20)
+ if dpdk:
+ res = self.set_property()
+ LOG.info('Update flavor property')
+ LOG.info(json.dumps(res, indent=4))
+ time.sleep(20)
res = self.create_cirros()
LOG.info(json.dumps(res, indent=4))
@@ -304,12 +317,12 @@
return {'inspect': inspect,
'logs': logs}
- def prepare_and_run_tempest(self, username='root'):
+ def prepare_and_run_tempest(self, username='root', dpdk=None):
"""
Run tempest tests
"""
tempest_timeout = settings.TEMPEST_TIMEOUT
- self.prepare()
+ self.prepare(dpdk=dpdk)
test_res = self.run_tempest(tempest_timeout)
self.fetch_arficats(username=username)
self.save_runtime_logs(**test_res)
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 eca7a20..69d8324 100644
--- a/tcp_tests/tests/system/test_install_mcp_ovs_pike.py
+++ b/tcp_tests/tests/system/test_install_mcp_ovs_pike.py
@@ -277,3 +277,25 @@
if settings.RUN_TEMPEST:
tempest_actions.prepare_and_run_tempest()
LOG.info("*************** DONE **************")
+
+ @pytest.mark.grab_versions
+ @pytest.mark.fail_snapshot
+ def test_mcp_dpdk_ovs_install(self, underlay,
+ openstack_deployed,
+ openstack_actions,
+ tempest_actions):
+ """Test for deploying an mcp environment and check it
+ Scenario:
+ 1. Prepare salt on hosts
+ 2. Setup controller nodes
+ 3. Setup compute nodes
+ 4. Run tempest
+
+ """
+ openstack_actions._salt.local(
+ 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)
+
+ LOG.info("*************** DONE **************")