Port all changes from github
Change-Id: Ie78388290ad2780074327c26508cdce73805f0da
diff --git a/cvp_checks/tests/test_ui_addresses.py b/cvp_checks/tests/test_ui_addresses.py
index 22e8319..69c0f6a 100644
--- a/cvp_checks/tests/test_ui_addresses.py
+++ b/cvp_checks/tests/test_ui_addresses.py
@@ -34,20 +34,19 @@
def test_ui_prometheus(local_salt_client):
- pytest.skip("This test doesn't work. Skipped")
- IP = utils.get_monitoring_ip('keepalived_prometheus_vip_address')
+ IP = utils.get_monitoring_ip('stacklight_monitor_address')
result = local_salt_client.cmd(
'keystone:server',
'cmd.run',
- ['curl http://{}:15010/ 2>&1 | \
- grep loading'.format(IP)],
+ ['curl http://{}:15010/graph 2>&1 | \
+ grep Prometheus'.format(IP)],
expr_form='pillar')
assert len(result[result.keys()[0]]) != 0, \
'Prometheus page is not reachable on {} from ctl nodes'.format(IP)
def test_ui_alert_manager(local_salt_client):
- IP = utils.get_monitoring_ip('cluster_public_host')
+ IP = utils.get_monitoring_ip('stacklight_monitor_address')
result = local_salt_client.cmd(
'keystone:server',
'cmd.run',