diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-11 14:24:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-11 14:24:11 +0000 |
| commit | 910ff2f346d819148b555e50d4425dd99b6a1ba9 (patch) | |
| tree | 154a0e26f1aea9b96754bfad0bd97895b611f9e3 | |
| parent | f45c941f1da5504ac3e3b1b0f04c8e3f08404144 (diff) | |
| parent | bec2e27dd5bb18f5912f95a160f8258e3d813e9e (diff) | |
| download | ceilometer-910ff2f346d819148b555e50d4425dd99b6a1ba9.tar.gz | |
Merge "Keep the instance_type meta from polling and notification consistent" into stable/kilo
| -rw-r--r-- | ceilometer/compute/pollsters/util.py | 3 | ||||
| -rw-r--r-- | ceilometer/tests/compute/pollsters/test_instance.py | 9 | ||||
| -rw-r--r-- | ceilometer/tests/compute/pollsters/test_location_metadata.py | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/ceilometer/compute/pollsters/util.py b/ceilometer/compute/pollsters/util.py index 719818d0..f5e9a80b 100644 --- a/ceilometer/compute/pollsters/util.py +++ b/ceilometer/compute/pollsters/util.py @@ -33,10 +33,11 @@ INSTANCE_PROPERTIES = [ def _get_metadata_from_object(instance): """Return a metadata dictionary for the instance.""" + instance_type = instance.flavor['name'] if instance.flavor else None metadata = { 'display_name': instance.name, 'name': getattr(instance, 'OS-EXT-SRV-ATTR:instance_name', u''), - 'instance_type': (instance.flavor['id'] if instance.flavor else None), + 'instance_type': instance_type, 'host': instance.hostId, 'flavor': instance.flavor, 'status': instance.status.lower(), diff --git a/ceilometer/tests/compute/pollsters/test_instance.py b/ceilometer/tests/compute/pollsters/test_instance.py index eaa144d2..246fdcb4 100644 --- a/ceilometer/tests/compute/pollsters/test_instance.py +++ b/ceilometer/tests/compute/pollsters/test_instance.py @@ -75,3 +75,12 @@ class TestInstancePollster(base.TestPollsterBase): pollster = pollsters_instance.InstancePollster() samples = list(pollster.get_samples(mgr, {}, [self.instance])) self.assertNotIn('user_metadata', samples[0].resource_metadata) + + @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) + def test_get_flavor_name_as_metadata_instance_type(self): + mgr = manager.AgentManager() + pollster = pollsters_instance.InstancePollster() + samples = list(pollster.get_samples(mgr, {}, [self.instance])) + self.assertEqual(1, len(samples)) + self.assertEqual('m1.small', + samples[0].resource_metadata['instance_type']) diff --git a/ceilometer/tests/compute/pollsters/test_location_metadata.py b/ceilometer/tests/compute/pollsters/test_location_metadata.py index 6faa4619..5ac3c846 100644 --- a/ceilometer/tests/compute/pollsters/test_location_metadata.py +++ b/ceilometer/tests/compute/pollsters/test_location_metadata.py @@ -66,7 +66,8 @@ class TestLocationMetadata(base.BaseTestCase): 'links': [{"rel": "bookmark", 'href': 2}]}, 'hostId': '1234-5678', - 'flavor': {'id': 1, + 'flavor': {'name': 'm1.tiny', + 'id': 1, 'disk': 20, 'ram': 512, 'vcpus': 2, |