Add model cookied-bm-contrail with MaaS
Change-Id: I8f29d684a5de003f2f1788cfb8c56a8ef819eae0
diff --git a/tcp_tests/tests/system/test_opencontrail.py b/tcp_tests/tests/system/test_opencontrail.py
index 39d3d59..91d7789 100644
--- a/tcp_tests/tests/system/test_opencontrail.py
+++ b/tcp_tests/tests/system/test_opencontrail.py
@@ -47,9 +47,61 @@
openstack_deployed.download_tempest_report(stored_node='ctl01')
LOG.info("*************** DONE **************")
- # opencontrail.prepare_tests(
- # config.opencontrail.opencontrail_prepare_tests_steps_path)
+ @pytest.mark.fail_snapshot
+ @pytest.mark.with_rally(rally_node="ctl01.")
+ def test_opencontrail_maas(self, config, underlay, salt_actions,
+ openstack_deployed, show_step, sl_deployed):
+ """Runner for Juniper contrail-tests
- # opencontrail.run_tests(
- # tags=config.opencontrail.opencontrail_tags,
- # features=config.opencontrail.opencontrail_features)
+ Scenario:
+ 1. Prepare salt on hosts
+ 2. Setup controller nodes
+ 3. Setup compute nodes
+ 4. Run tempest
+ 5. Exporting results
+ 6. Check docker services
+ 7. Run SL tests
+ 8. Download sl tests report
+ """
+ openstack_deployed._salt.local(
+ tgt='*', fun='cmd.run',
+ args='service ntp stop; ntpd -gq; service ntp start')
+
+ if settings.RUN_TEMPEST:
+ show_step(4)
+ openstack_deployed.run_tempest(target='ctl01',
+ pattern=settings.PATTERN)
+ openstack_deployed.download_tempest_report(stored_node='ctl01')
+
+ expected_service_list = ['monitoring_server',
+ 'monitoring_remote_agent',
+ 'dashboard_grafana',
+ 'monitoring_alertmanager',
+ 'monitoring_remote_collector',
+ 'monitoring_pushgateway']
+ mon_nodes = sl_deployed.get_monitoring_nodes()
+ LOG.debug('Mon nodes list {0}'.format(mon_nodes))
+
+ prometheus_relay_enabled = salt_actions.get_pillar(
+ tgt=mon_nodes[0],
+ pillar="prometheus:relay:enabled")[0]
+ if not prometheus_relay_enabled:
+ # InfluxDB is used if prometheus relay service is not installed
+ expected_service_list.append('monitoring_remote_storage_adapter')
+ show_step(6)
+ sl_deployed.check_docker_services(mon_nodes, expected_service_list)
+ # Run SL component tetsts
+ if settings.RUN_SL_TESTS:
+ show_step(7)
+ sl_deployed.run_sl_functional_tests(
+ 'cfg01',
+ '/root/stacklight-pytest/stacklight_tests/',
+ 'tests/prometheus',
+ 'test_alerts.py')
+ show_step(8)
+ # Download report
+ sl_deployed.download_sl_test_report(
+ 'cfg01',
+ '/root/stacklight-pytest/stacklight_tests/report.xml')
+
+ LOG.info("*************** DONE **************")