diff options
| author | Deepthi V V <deepthi.v.v@ericsson.com> | 2017-07-04 12:39:01 +0530 |
|---|---|---|
| committer | Deepthi V V <deepthi.v.v@ericsson.com> | 2017-07-19 00:39:12 +0530 |
| commit | bd81d3536e611ae8282f82edd38256e0f5e57537 (patch) | |
| tree | 39415bff12b461e0e6691b289a03e33ecd1581f0 /ceilometer/network | |
| parent | 5621e1cc32a59ed9626cde9f443f1bee605560f1 (diff) | |
| download | ceilometer-bd81d3536e611ae8282f82edd38256e0f5e57537.tar.gz | |
Project_id for SDN controller meters
Enable project_id config from SDN controller drivers.
Current code Project_id was set to None. With this commit,
project_id will be set by the driver. Existing drivers will set project_id
to None. OpenDayliht v2 driver will set project_id as the uuid of the
tenant owning the port for port meters and admin tenant id for switch,
switch.port and table meters.
Change-Id: I0e65d25e71d2d258ff0db76f020924170f380ec2
Implements: blueprint network-statistics-from-opendaylight
Closes-Bug: #1369428
Diffstat (limited to 'ceilometer/network')
| -rw-r--r-- | ceilometer/network/statistics/__init__.py | 4 | ||||
| -rw-r--r-- | ceilometer/network/statistics/opencontrail/driver.py | 2 | ||||
| -rw-r--r-- | ceilometer/network/statistics/opendaylight/driver.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ceilometer/network/statistics/__init__.py b/ceilometer/network/statistics/__init__.py index 5c14b06c..ef44238e 100644 --- a/ceilometer/network/statistics/__init__.py +++ b/ceilometer/network/statistics/__init__.py @@ -86,7 +86,7 @@ class _Base(plugin_base.PollsterBase): if not isinstance(data, list): data = [data] for (volume, resource_id, - resource_metadata) in data: + resource_metadata, project_id) in data: yield sample.Sample( name=self.meter_name, @@ -94,7 +94,7 @@ class _Base(plugin_base.PollsterBase): unit=self.meter_unit, volume=volume, user_id=None, - project_id=None, + project_id=project_id, resource_id=resource_id, resource_metadata=resource_metadata ) diff --git a/ceilometer/network/statistics/opencontrail/driver.py b/ceilometer/network/statistics/opencontrail/driver.py index f17a77b5..433b7878 100644 --- a/ceilometer/network/statistics/opencontrail/driver.py +++ b/ceilometer/network/statistics/opencontrail/driver.py @@ -110,7 +110,7 @@ class OpencontrailDriver(driver.Driver): for sample in iter(extractor, value, ports_map, resource, virtual_network): if sample is not None: - yield sample + yield sample + (None, ) def _get_iter(self, meter_name): if meter_name.startswith('switch.port'): diff --git a/ceilometer/network/statistics/opendaylight/driver.py b/ceilometer/network/statistics/opendaylight/driver.py index 79692935..444b02a5 100644 --- a/ceilometer/network/statistics/opendaylight/driver.py +++ b/ceilometer/network/statistics/opendaylight/driver.py @@ -200,7 +200,7 @@ class OpenDayLightDriver(driver.Driver): sample[2]['controller'] = 'OpenDaylight' sample[2]['container'] = name - samples.append(sample) + samples.append(sample + (None, )) return samples |