openstack/ceilometer
Code Issues Proposed changes

Merge "Properly handle 'resource_id' as None for Gnocchi publisher" into stable/yoga

Browse Source
This commit is contained in:
Zuul
2023-05-10 20:02:41 +00:00
committed by Gerrit Code Review
parent b7219be169 7d9e167da0
commit 82feb96ed3
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ceilometer/tests/unit/publisher/test_gnocchi.py
View File

@@ -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