From 3f530c85e8cc60babe3e20a9ae4da4a948cbf8d3 Mon Sep 17 00:00:00 2001 From: Adrian Czarnecki Date: Wed, 5 Sep 2018 11:41:33 +0200 Subject: [PATCH] Fix incorrect error when topic not found Story: 2003668 Task: 26186 Change-Id: I4df9e4373544a26c41ff4b0e8f6a0d68eccd0d78 --- monasca_api/healthcheck/kafka_check.py | 6 +++--- monasca_api/tests/test_kafka_health_check.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/monasca_api/healthcheck/kafka_check.py b/monasca_api/healthcheck/kafka_check.py index b600946ff..6eae26ce5 100644 --- a/monasca_api/healthcheck/kafka_check.py +++ b/monasca_api/healthcheck/kafka_check.py @@ -61,9 +61,9 @@ class KafkaHealthCheck(base.BaseHealthCheck): CONF.kafka.alarm_state_transitions_topic) for topic in topics: - for_topic = topic in kafka_client.topic_partitions - if not for_topic: - error_str = 'Kafka: Topic {0} not found'.format(for_topic) + topic_exists = topic in kafka_client.topics + if not topic_exists: + error_str = 'Kafka: Topic {0} not found'.format(topic) LOG.error(error_str) return False, str(error_str) return True, 'OK' diff --git a/monasca_api/tests/test_kafka_health_check.py b/monasca_api/tests/test_kafka_health_check.py index d8c421005..a42632508 100644 --- a/monasca_api/tests/test_kafka_health_check.py +++ b/monasca_api/tests/test_kafka_health_check.py @@ -59,7 +59,7 @@ class TestKafkaHealthCheckLogic(base.BaseTestCase): @mock.patch('monasca_api.healthcheck.kafka_check.client.KafkaClient') def test_should_fail_missing_topic(self, kafka_client): kafka = mock.Mock() - kafka.topic_partitions = ['topic1'] + kafka.topics = ['topic1'] kafka_client.return_value = kafka kafka_health = kc.KafkaHealthCheck() @@ -71,9 +71,9 @@ class TestKafkaHealthCheckLogic(base.BaseTestCase): @mock.patch('monasca_api.healthcheck.kafka_check.client.KafkaClient') def test_should_pass(self, kafka_client): kafka = mock.Mock() - kafka.topic_partitions = (self.mocked_topics, - self.mocked_event_topic, - self.mocked_alarm_state_topic) + kafka.topics = [self.mocked_topics, + self.mocked_event_topic, + self.mocked_alarm_state_topic] kafka_client.return_value = kafka kafka_health = kc.KafkaHealthCheck()