X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Ftests%2Funit%2Fcollector%2Fvnf_collectors%2Ftest_openstack.py;h=1f2d06a419b7704bb9b8058b172e145eedb07f08;hb=refs%2Fchanges%2F10%2F8910%2F1;hp=2949dc6c9758d5e904d1f0dd47d205a1c528de1f;hpb=be034667d2c58d33bd3657b82bb93d2021da8c73;p=osm%2FMON.git

diff --git a/osm_mon/tests/unit/collector/vnf_collectors/test_openstack.py b/osm_mon/tests/unit/collector/vnf_collectors/test_openstack.py
index 2949dc6..1f2d06a 100644
--- a/osm_mon/tests/unit/collector/vnf_collectors/test_openstack.py
+++ b/osm_mon/tests/unit/collector/vnf_collectors/test_openstack.py
@@ -23,6 +23,8 @@
 import datetime
 from unittest import TestCase, mock
 
+import gnocchiclient
+
 from osm_mon.collector.vnf_collectors.openstack import GnocchiBackend
 from osm_mon.core.config import Config
 
@@ -37,7 +39,7 @@ class CollectorTest(TestCase):
 
     @mock.patch.object(GnocchiBackend, '_build_neutron_client')
     @mock.patch.object(GnocchiBackend, '_build_gnocchi_client')
-    def test_collect_gnocchi_instance(self, build_gnocchi_client, build_neutron_client):
+    def test_collect_gnocchi_rate_instance(self, build_gnocchi_client, _):
         mock_gnocchi_client = mock.Mock()
         mock_gnocchi_client.metric.get_measures.return_value = [(datetime.datetime(2019, 4, 12, 15, 43,
                                                                                    tzinfo=datetime.timezone(
@@ -46,14 +48,52 @@ class CollectorTest(TestCase):
                                                                 (datetime.datetime(2019, 4, 12, 15, 44,
                                                                                    tzinfo=datetime.timezone(
                                                                                        datetime.timedelta(0),
-                                                                                       '+00:00')), 60.0, 0.0333070363)]
+                                                                                       '+00:00')), 60.0, 600000000)]
         build_gnocchi_client.return_value = mock_gnocchi_client
 
-        backend = GnocchiBackend('test_uuid')
-        value = backend._collect_instance_metric('cpu_utilization', 'test_resource_id')
-        self.assertEqual(value, 0.0333070363)
-        mock_gnocchi_client.metric.get_measures.assert_called_once_with('cpu_utilization',
-                                                                        limit=1,
+        backend = GnocchiBackend({'_id': 'test_uuid'})
+        value = backend._collect_instance_metric('cpu', 'test_resource_id')
+        self.assertEqual(value, 1.0)
+        mock_gnocchi_client.metric.get_measures.assert_called_once_with('cpu',
+                                                                        aggregation="rate:mean",
+                                                                        start=mock.ANY,
+                                                                        resource_id='test_resource_id')
+
+    @mock.patch.object(GnocchiBackend, '_build_neutron_client')
+    @mock.patch.object(GnocchiBackend, '_build_gnocchi_client')
+    def test_collect_gnocchi_non_rate_instance(self, build_gnocchi_client, _):
+        mock_gnocchi_client = mock.Mock()
+        mock_gnocchi_client.metric.get_measures.return_value = [(datetime.datetime(2019, 4, 12, 15, 43,
+                                                                                   tzinfo=datetime.timezone(
+                                                                                       datetime.timedelta(0),
+                                                                                       '+00:00')), 60.0, 0.0345442539),
+                                                                (datetime.datetime(2019, 4, 12, 15, 44,
+                                                                                   tzinfo=datetime.timezone(
+                                                                                       datetime.timedelta(0),
+                                                                                       '+00:00')), 60.0, 128)]
+        build_gnocchi_client.return_value = mock_gnocchi_client
+
+        backend = GnocchiBackend({'_id': 'test_uuid'})
+        value = backend._collect_instance_metric('memory.usage', 'test_resource_id')
+        self.assertEqual(value, 128)
+        mock_gnocchi_client.metric.get_measures.assert_called_once_with('memory.usage',
+                                                                        aggregation=None,
+                                                                        start=mock.ANY,
+                                                                        resource_id='test_resource_id')
+
+    @mock.patch.object(GnocchiBackend, '_build_neutron_client')
+    @mock.patch.object(GnocchiBackend, '_build_gnocchi_client')
+    def test_collect_gnocchi_no_metric(self, build_gnocchi_client, _):
+        mock_gnocchi_client = mock.Mock()
+        mock_gnocchi_client.metric.get_measures.side_effect = gnocchiclient.exceptions.NotFound()
+        build_gnocchi_client.return_value = mock_gnocchi_client
+
+        backend = GnocchiBackend({'_id': 'test_uuid'})
+        value = backend._collect_instance_metric('memory.usage', 'test_resource_id')
+        self.assertIsNone(value)
+        mock_gnocchi_client.metric.get_measures.assert_called_once_with('memory.usage',
+                                                                        aggregation=None,
+                                                                        start=mock.ANY,
                                                                         resource_id='test_resource_id')
 
     @mock.patch.object(GnocchiBackend, '_build_neutron_client')
@@ -87,7 +127,7 @@ class CollectorTest(TestCase):
         build_gnocchi_client.return_value = mock_gnocchi_client
         build_neutron_client.return_value = mock_neutron_client
 
-        backend = GnocchiBackend('test_uuid')
+        backend = GnocchiBackend({'_id': 'test_uuid'})
         value = backend._collect_interface_one_metric('packets_received', 'test_resource_id', 'eth0')
         self.assertEqual(value, 0.0333070363)
         mock_gnocchi_client.metric.get_measures.assert_called_once_with('packets_received', resource_id='test_id',
@@ -110,7 +150,7 @@ class CollectorTest(TestCase):
 
         build_gnocchi_client.return_value = mock_gnocchi_client
 
-        backend = GnocchiBackend('test_uuid')
+        backend = GnocchiBackend({'_id': 'test_uuid'})
         value = backend._collect_interface_all_metric('packets_received', 'test_resource_id')
         self.assertEqual(value, 0.0666140726)
         mock_gnocchi_client.metric.get_measures.assert_any_call('packets_received', resource_id='test_id_1',