From 38fef22ee1db1b4e32c77b356eec61ce325e97f2 Mon Sep 17 00:00:00 2001 From: Peter Razumovsky Date: Mon, 10 Sep 2018 14:58:00 +0400 Subject: [PATCH] Fix kwargs for Grafana service in scenario plugin Remove extra kwargs in grafana scenarios for push_metrics and check_metrics grafana service methods. Change-Id: I6bbd78ba5b4c8882d53ae059e5ba92cd1fa07f48 --- rally_openstack/scenarios/grafana/metrics.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/rally_openstack/scenarios/grafana/metrics.py b/rally_openstack/scenarios/grafana/metrics.py index bfffb5be..f48c050b 100644 --- a/rally_openstack/scenarios/grafana/metrics.py +++ b/rally_openstack/scenarios/grafana/metrics.py @@ -108,10 +108,7 @@ class PushMetricsInstance(scenario.OpenStackScenario): self._metric_from_instance(seed, image, flavor, monitor_vip, pushgateway_port, job_name) - checked = grafana_svc.check_metric(seed, monitor_vip=monitor_vip, - grafana=grafana, - datasource_id=datasource_id, - sleep_time=sleep_time, + checked = grafana_svc.check_metric(seed, sleep_time=sleep_time, retries_total=retries_total) self.assertTrue(checked) @@ -143,13 +140,8 @@ class PushMetricLocal(scenario.OpenStackScenario): name_generator=self.generate_random_name, atomic_inst=self.atomic_actions()) - pushed = grafana_svc.push_metric(seed, monitor_vip=monitor_vip, - pushgateway_port=pushgateway_port, - job_name=job_name) + pushed = grafana_svc.push_metric(seed) self.assertTrue(pushed) - checked = grafana_svc.check_metric(seed, monitor_vip=monitor_vip, - grafana=grafana, - datasource_id=datasource_id, - sleep_time=sleep_time, + checked = grafana_svc.check_metric(seed, sleep_time=sleep_time, retries_total=retries_total) self.assertTrue(checked)