X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osm_mon%2Ftests%2Funit%2Fcollector%2Fvnf_collectors%2Ftest_openstack.py;h=0b4f4a7239a4061e72199e41e7b03ed7a09ebf04;hb=refs%2Fchanges%2F09%2F12109%2F1;hp=b42e0d491fdbbbc1a1658eb32f7d64362dd7e82c;hpb=8e4179facf22c8096992f0a83caeec9f2f4996c7;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 b42e0d4..0b4f4a7 100644
--- a/osm_mon/tests/unit/collector/vnf_collectors/test_openstack.py
+++ b/osm_mon/tests/unit/collector/vnf_collectors/test_openstack.py
@@ -45,6 +45,7 @@ class CollectorTest(TestCase):
     def test_collect_gnocchi_rate_instance(self, build_gnocchi_client, _):
         mock_gnocchi_client = mock.Mock()
         mock_gnocchi_client.metric = mock.Mock()
+        mock_vim_session = mock.Mock()
         mock_gnocchi_client.metric.get_measures.return_value = [
             (
                 datetime.datetime(
@@ -73,7 +74,7 @@ class CollectorTest(TestCase):
         ]
         build_gnocchi_client.return_value = mock_gnocchi_client
 
-        backend = GnocchiBackend({"_id": "test_uuid"})
+        backend = GnocchiBackend({"_id": "test_uuid"}, mock_vim_session)
         value = backend._collect_instance_metric("cpu", "test_resource_id")
         self.assertEqual(value, 1.0)
         mock_gnocchi_client.metric.get_measures.assert_called_once_with(
@@ -87,6 +88,7 @@ class CollectorTest(TestCase):
     @mock.patch.object(GnocchiBackend, "_build_gnocchi_client")
     def test_collect_gnocchi_non_rate_instance(self, build_gnocchi_client, _):
         mock_gnocchi_client = mock.Mock()
+        mock_vim_session = mock.Mock()
         mock_gnocchi_client.metric.get_measures.return_value = [
             (
                 datetime.datetime(
@@ -115,7 +117,7 @@ class CollectorTest(TestCase):
         ]
         build_gnocchi_client.return_value = mock_gnocchi_client
 
-        backend = GnocchiBackend({"_id": "test_uuid"})
+        backend = GnocchiBackend({"_id": "test_uuid"}, mock_vim_session)
         value = backend._collect_instance_metric("memory.usage", "test_resource_id")
         self.assertEqual(value, 128)
         mock_gnocchi_client.metric.get_measures.assert_called_once_with(
@@ -129,12 +131,13 @@ class CollectorTest(TestCase):
     @mock.patch.object(GnocchiBackend, "_build_gnocchi_client")
     def test_collect_gnocchi_no_metric(self, build_gnocchi_client, _):
         mock_gnocchi_client = mock.Mock()
+        mock_vim_session = 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"})
+        backend = GnocchiBackend({"_id": "test_uuid"}, mock_vim_session)
         value = backend._collect_instance_metric("memory.usage", "test_resource_id")
         self.assertIsNone(value)
         mock_gnocchi_client.metric.get_measures.assert_called_once_with(
@@ -150,6 +153,7 @@ class CollectorTest(TestCase):
         self, build_gnocchi_client, build_neutron_client
     ):
         mock_gnocchi_client = mock.Mock()
+        mock_vim_session = mock.Mock()
         mock_gnocchi_client.resource.search.return_value = [
             {"id": "test_id_1"},
             {"id": "test_id_2"},
@@ -183,7 +187,7 @@ class CollectorTest(TestCase):
 
         build_gnocchi_client.return_value = mock_gnocchi_client
 
-        backend = GnocchiBackend({"_id": "test_uuid"})
+        backend = GnocchiBackend({"_id": "test_uuid"}, mock_vim_session)
         value = backend._collect_interface_all_metric(
             "packets_received", "test_resource_id"
         )
@@ -194,3 +198,51 @@ class CollectorTest(TestCase):
         mock_gnocchi_client.metric.get_measures.assert_any_call(
             "packets_received", resource_id="test_id_2", limit=1
         )
+
+    @mock.patch.object(GnocchiBackend, "_build_neutron_client")
+    @mock.patch.object(GnocchiBackend, "_build_gnocchi_client")
+    def test_collect_instance_disk_metric(
+        self, build_gnocchi_client, build_neutron_client
+    ):
+        mock_gnocchi_client = mock.Mock()
+        mock_vim_session = mock.Mock()
+        mock_gnocchi_client.resource.search.return_value = [
+            {"id": "test_id"},
+        ]
+        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.0225808,
+            ),
+            (
+                datetime.datetime(
+                    2019,
+                    4,
+                    12,
+                    15,
+                    44,
+                    tzinfo=datetime.timezone(datetime.timedelta(0), "+00:00"),
+                ),
+                60.0,
+                230848,
+            ),
+        ]
+
+        build_gnocchi_client.return_value = mock_gnocchi_client
+
+        backend = GnocchiBackend({"_id": "test_uuid"}, mock_vim_session)
+        value = backend._collect_instance_disk_metric(
+            "disk_read_bytes", "test_resource_id"
+        )
+        self.assertEqual(value, 230848)
+        mock_gnocchi_client.metric.get_measures.assert_any_call(
+            "disk_read_bytes", resource_id="test_id", limit=1
+        )