From 7d9e167da040d1e30aa2cd25d80aa751635212f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= <rafael@apache.org>
Date: Sun, 11 Sep 2022 17:02:11 -0300
Subject: [PATCH] Properly handle 'resource_id' as None for Gnocchi publisher

This issue is related to [1]. In Python 3 (I did not check exactly in
which version), the following code was throwing an error
`data.sort(key=operator.attrgetter('resource_id'))`. Therefore, this
patch is proposing a solution for such situations to properly handle
samples where the `resource_id` is None. Of course, `resource_id`
cannot be None in Gnocchi. However, that can be properly handled by
removing the metric to be pushed from the `gnocchi_resource.yml` file.
Which is what we were doing when we proposed [1]. The problem is that
the sort is happening before that part of the code is executed, to
decide if the sample should be ignored or not.

[1] https://review.opendev.org/c/openstack/ceilometer/+/746717

Change-Id: Ie8eb42df3d5b9505160c9e9d6b86bdaa9a02d16a
(cherry picked from commit b7c2c7ca965659255e9a611666e58b024c27d804)
(cherry picked from commit 5968c822bebbaa47ef71d56abb4b7c2bd41fa7b9)
---
 .../tests/unit/publisher/test_gnocchi.py      | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/ceilometer/tests/unit/publisher/test_gnocchi.py b/ceilometer/tests/unit/publisher/test_gnocchi.py
index 68d07a1419..b048d240a8 100644
--- a/ceilometer/tests/unit/publisher/test_gnocchi.py
+++ b/ceilometer/tests/unit/publisher/test_gnocchi.py
@@ -375,18 +375,30 @@ class PublisherTest(base.BaseTestCase):
     @mock.patch('ceilometer.publisher.gnocchi.GnocchiPublisher'
                 '.batch_measures')
     def test_unhandled_meter_with_no_resource_id(self, fake_batch):
-        samples = [sample.Sample(
-            name='unknown.meter',
-            unit='GB',
-            type=sample.TYPE_GAUGE,
-            volume=2,
-            user_id='test_user',
-            project_id='test_project',
-            source='openstack',
-            timestamp='2014-05-08 20:23:48.028195',
-            resource_id=None,
-            resource_metadata={}
-        )]
+        samples = [
+            sample.Sample(
+                name='unknown.meter',
+                unit='GB',
+                type=sample.TYPE_GAUGE,
+                volume=2,
+                user_id='test_user',
+                project_id='test_project',
+                source='openstack',
+                timestamp='2014-05-08 20:23:48.028195',
+                resource_id=None,
+                resource_metadata={}),
+            sample.Sample(
+                name='unknown.meter',
+                unit='GB',
+                type=sample.TYPE_GAUGE,
+                volume=2,
+                user_id='test_user',
+                project_id='test_project',
+                source='openstack',
+                timestamp='2014-05-08 20:23:48.028195',
+                resource_id="Some-other-resource-id",
+                resource_metadata={})
+        ]
         url = netutils.urlsplit("gnocchi://")
         d = gnocchi.GnocchiPublisher(self.conf.conf, url)
         d._already_checked_archive_policies = True