Merge "Fix noop client getters"

designate/metrics_client/noop.py

@@ -56,7 +56,7 @@ def __sub__(self, value):
         pass
 
 
-class NoopGuage(object):
+class NoopGauge(object):
     def __init__(self):
         pass
 
@@ -75,16 +75,16 @@ def timed(self, *a, **kw):
 class Client(object):
     def __init__(self, *a, **kw):
         self._counter = NoopCounter()
-        self._guage = NoopGuage()
+        self._gauge = NoopGauge()
         self._timer = NoopTimer()
         self.connection = NoopConnection()
         pass
 
     def get_counter(self, *a, **kw):
-        return None
+        return self._counter
 
-    def get_guage(self, *a, **kw):
-        return None
+    def get_gauge(self, *a, **kw):
+        return self._gauge
 
     def get_timer(self):
-        return None
+        return self._timer

designate/tests/unit/test_metrics/test_metrics.py

@@ -15,6 +15,7 @@
 #
 
 import mock
+import monascastatsd
 
 from designate.metrics import Metrics
 from designate.metrics_client import noop
@@ -42,4 +43,46 @@ def test_noop_metrics_enabled(self):
     def test_noop_metrics_disabled(self):
         with mock.patch('designate.metrics_client.noop.LOG') as log_mock:
             self.metrics.init()
-            log_mock.error.assert_not_called()
+            log_mock.error.assert_not_called()
+
+    def test_noop_metrics_client_getters(self):
+        self.CONF.set_override('enabled', True, 'monasca:statsd')
+        self.metrics.init()
+        self.assertIsInstance(self.metrics.counter('name'), noop.NoopCounter)
+        self.assertIsInstance(self.metrics.gauge(), noop.NoopGauge)
+        self.assertIsInstance(self.metrics.timer(), noop.NoopTimer)
+        self.assertIsNotNone(self.metrics.timed.__self__)
+
+
+class TestMonascaMetrics(TestCase):
+
+    def setUp(self):
+        super(TestCase, self).setUp()
+        self.CONF = self.useFixture(cfg_fixture.Config(cfg.CONF)).conf
+        self.metrics = Metrics()
+
+    def test_monasca_metrics_enabled(self):
+        self.CONF.set_override('enabled', True, 'monasca:statsd')
+        with mock.patch('designate.metrics.LOG') as log_mock:
+            self.metrics.init()
+            log_mock.info.assert_called_once_with(
+                "Statsd reports to 127.0.0.1 8125")
+
+    def test_monasca_metrics_disabled(self):
+        with mock.patch('designate.metrics.LOG') as log_mock:
+            self.metrics.init()
+            log_mock.info.assert_called_once_with(
+                "Statsd disabled")
+
+    @mock.patch('socket.socket.connect')
+    @mock.patch('socket.socket.send')
+    def test_monasca_metrics_client_getters(self, conn_mock, send_mock):
+        self.CONF.set_override('enabled', True, 'monasca:statsd')
+        self.metrics.init()
+        self.assertIsInstance(self.metrics.counter('name'),
+                              monascastatsd.counter.Counter)
+        self.assertIsInstance(self.metrics.gauge(),
+                              monascastatsd.gauge.Gauge)
+        self.assertIsInstance(self.metrics.timer(),
+                              monascastatsd.timer.Timer)
+        self.assertIsNotNone(self.metrics.timed.__self__)