openstack/panko
Code Issues Proposed changes

Use make_sample_from_instance for net-pollster

Browse Source 
The net-pollster doesn't have the same metadata than other pollster.

This change fixes that.

Also the test is modified because if the metering metadata is already
present in instance metadata they are filtered out.

Change-Id: I50676067636ad01599f9dd5f0c31071b86f1466c
Closes-bug: #1496778
This commit is contained in:
Mehdi Abaakouk 2015-09-17 11:57:51 +02:00
parent ac5811d758
commit 6c1be9b931
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ceilometer/compute/pollsters/net.py
View File

@ -17,12 +17,10 @@
import copy
from oslo_log import log
from oslo_utils import timeutils
import ceilometer
from ceilometer.compute import pollsters
from ceilometer.compute.pollsters import util
from ceilometer.compute import util as compute_util
from ceilometer.compute.virt import inspector as virt_inspector
from ceilometer.i18n import _, _LW
from ceilometer import sample
@ -38,32 +36,23 @@ class _Base(pollsters.BaseComputePollster):
@staticmethod
def make_vnic_sample(instance, name, type, unit, volume, vnic_data):
metadata = copy.copy(vnic_data)
resource_metadata = dict(zip(metadata._fields, metadata))
resource_metadata['instance_id'] = instance.id
resource_metadata['instance_type'] = (instance.flavor['id'] if
instance.flavor else None)
compute_util.add_reserved_user_metadata(instance.metadata,
resource_metadata)
additional_metadata = dict(zip(metadata._fields, metadata))
if vnic_data.fref is not None:
rid = vnic_data.fref
resource_metadata['vnic_name'] = vnic_data.fref
additional_metadata['vnic_name'] = vnic_data.fref
else:
instance_name = util.instance_name(instance)
rid = "%s-%s-%s" % (instance_name, instance.id, vnic_data.name)
resource_metadata['vnic_name'] = vnic_data.name
additional_metadata['vnic_name'] = vnic_data.name
return sample.Sample(
return util.make_sample_from_instance(
instance=instance,
name=name,
type=type,
unit=unit,
volume=volume,
user_id=instance.user_id,
project_id=instance.tenant_id,
resource_id=rid,
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=resource_metadata
additional_metadata=additional_metadata
)
CACHE_KEY_VNIC = 'vnics'

6
ceilometer/tests/unit/compute/pollsters/test_net.py
View File

@ -98,14 +98,14 @@ class TestNetPollster(base.TestPollsterBase):
'links': [{"rel": "bookmark",
'href': 2}]},
'hostId': '1234-5678',
'flavor': {'id': 1,
'disk': 20,
'flavor': {'disk': 20,
'ram': 512,
'name': 'tiny',
'vcpus': 2,
'ephemeral': 0},
'metadata': {'metering.autoscale.group':
'X' * 512,
'metering.ephemeral_gb': 42}}
'metering.foobar': 42}}
self.faux_instance = FauxInstance(**self.INSTANCE_PROPERTIES)