Merge "Remove metrics specific to OpenDaylight"
This commit is contained in:
commit
623d2c4429
@ -182,15 +182,6 @@ resources_update_operations = [
|
||||
"attributes": {"controller": {"type": "string", "min_length": 0,
|
||||
"max_length": 255, "required": True}}
|
||||
}]},
|
||||
{"desc": "add switch_table resource type",
|
||||
"type": "create_resource_type",
|
||||
"resource_type": "switch_table",
|
||||
"data": [{
|
||||
"attributes": {"switch": {"type": "string", "min_length": 0,
|
||||
"max_length": 64, "required": True},
|
||||
"controller": {"type": "string", "min_length": 0,
|
||||
"max_length": 255, "required": True}}
|
||||
}]},
|
||||
{"desc": "add volume provider resource type",
|
||||
"type": "create_resource_type",
|
||||
"resource_type": "volume_provider",
|
||||
|
@ -1,53 +0,0 @@
|
||||
#
|
||||
# Copyright 2014 NEC Corporation. All rights reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
|
||||
from ceilometer.network import statistics
|
||||
from ceilometer import sample
|
||||
|
||||
|
||||
class FlowPollster(statistics._Base):
|
||||
|
||||
meter_name = 'switch.flow'
|
||||
meter_type = sample.TYPE_GAUGE
|
||||
meter_unit = 'flow'
|
||||
|
||||
|
||||
class FlowPollsterDurationSeconds(statistics._Base):
|
||||
|
||||
meter_name = 'switch.flow.duration_seconds'
|
||||
meter_type = sample.TYPE_GAUGE
|
||||
meter_unit = 's'
|
||||
|
||||
|
||||
class FlowPollsterDurationNanoseconds(statistics._Base):
|
||||
|
||||
meter_name = 'switch.flow.duration_nanoseconds'
|
||||
meter_type = sample.TYPE_GAUGE
|
||||
meter_unit = 'ns'
|
||||
|
||||
|
||||
class FlowPollsterPackets(statistics._Base):
|
||||
|
||||
meter_name = 'switch.flow.packets'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'packet'
|
||||
|
||||
|
||||
class FlowPollsterBytes(statistics._Base):
|
||||
|
||||
meter_name = 'switch.flow.bytes'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'B'
|
@ -58,59 +58,3 @@ class PortPollsterTransmitBytes(statistics._Base):
|
||||
meter_name = 'switch.port.transmit.bytes'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'B'
|
||||
|
||||
|
||||
class PortPollsterReceiveDrops(statistics._Base):
|
||||
|
||||
meter_name = 'switch.port.receive.drops'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'packet'
|
||||
|
||||
|
||||
class PortPollsterTransmitDrops(statistics._Base):
|
||||
|
||||
meter_name = 'switch.port.transmit.drops'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'packet'
|
||||
|
||||
|
||||
class PortPollsterReceiveErrors(statistics._Base):
|
||||
|
||||
meter_name = 'switch.port.receive.errors'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'packet'
|
||||
|
||||
|
||||
class PortPollsterTransmitErrors(statistics._Base):
|
||||
|
||||
meter_name = 'switch.port.transmit.errors'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'packet'
|
||||
|
||||
|
||||
class PortPollsterReceiveFrameErrors(statistics._Base):
|
||||
|
||||
meter_name = 'switch.port.receive.frame_error'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'packet'
|
||||
|
||||
|
||||
class PortPollsterReceiveOverrunErrors(statistics._Base):
|
||||
|
||||
meter_name = 'switch.port.receive.overrun_error'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'packet'
|
||||
|
||||
|
||||
class PortPollsterReceiveCRCErrors(statistics._Base):
|
||||
|
||||
meter_name = 'switch.port.receive.crc_error'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'packet'
|
||||
|
||||
|
||||
class PortPollsterCollisionCount(statistics._Base):
|
||||
|
||||
meter_name = 'switch.port.collision.count'
|
||||
meter_type = sample.TYPE_CUMULATIVE
|
||||
meter_unit = 'packet'
|
||||
|
@ -1,46 +0,0 @@
|
||||
#
|
||||
# Copyright 2014 NEC Corporation. All rights reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
|
||||
from ceilometer.network import statistics
|
||||
from ceilometer import sample
|
||||
|
||||
|
||||
class TablePollster(statistics._Base):
|
||||
|
||||
meter_name = 'switch.table'
|
||||
meter_type = sample.TYPE_GAUGE
|
||||
meter_unit = 'table'
|
||||
|
||||
|
||||
class TablePollsterActiveEntries(statistics._Base):
|
||||
|
||||
meter_name = 'switch.table.active.entries'
|
||||
meter_type = sample.TYPE_GAUGE
|
||||
meter_unit = 'entry'
|
||||
|
||||
|
||||
class TablePollsterLookupPackets(statistics._Base):
|
||||
|
||||
meter_name = 'switch.table.lookup.packets'
|
||||
meter_type = sample.TYPE_GAUGE
|
||||
meter_unit = 'packet'
|
||||
|
||||
|
||||
class TablePollsterMatchedPackets(statistics._Base):
|
||||
|
||||
meter_name = 'switch.table.matched.packets'
|
||||
meter_type = sample.TYPE_GAUGE
|
||||
meter_unit = 'packet'
|
@ -314,14 +314,6 @@ resources:
|
||||
switch.port.transmit.packets:
|
||||
switch.port.receive.bytes:
|
||||
switch.port.transmit.bytes:
|
||||
switch.port.receive.drops:
|
||||
switch.port.transmit.drops:
|
||||
switch.port.receive.errors:
|
||||
switch.port.transmit.errors:
|
||||
switch.port.receive.frame_error:
|
||||
switch.port.receive.overrun_error:
|
||||
switch.port.receive.crc_error:
|
||||
switch.port.collision.count:
|
||||
attributes:
|
||||
switch: resource_metadata.switch
|
||||
port_number_on_switch: resource_metadata.port_number_on_switch
|
||||
@ -340,10 +332,3 @@ resources:
|
||||
port.receive.errors:
|
||||
attributes:
|
||||
controller: resource_metadata.controller
|
||||
|
||||
- resource_type: switch_table
|
||||
metrics:
|
||||
switch.table.active.entries:
|
||||
attributes:
|
||||
controller: resource_metadata.controller
|
||||
switch: resource_metadata.switch
|
||||
|
@ -1,56 +0,0 @@
|
||||
#
|
||||
# Copyright 2014 NEC Corporation. All rights reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from ceilometer.network.statistics import flow
|
||||
from ceilometer import sample
|
||||
from ceilometer.tests.unit.network import statistics
|
||||
|
||||
|
||||
class TestFlowPollsters(statistics._PollsterTestBase):
|
||||
|
||||
def test_flow_pollster(self):
|
||||
self._test_pollster(
|
||||
flow.FlowPollster,
|
||||
'switch.flow',
|
||||
sample.TYPE_GAUGE,
|
||||
'flow')
|
||||
|
||||
def test_flow_pollster_duration_seconds(self):
|
||||
self._test_pollster(
|
||||
flow.FlowPollsterDurationSeconds,
|
||||
'switch.flow.duration_seconds',
|
||||
sample.TYPE_GAUGE,
|
||||
's')
|
||||
|
||||
def test_flow_pollster_duration_nanoseconds(self):
|
||||
self._test_pollster(
|
||||
flow.FlowPollsterDurationNanoseconds,
|
||||
'switch.flow.duration_nanoseconds',
|
||||
sample.TYPE_GAUGE,
|
||||
'ns')
|
||||
|
||||
def test_flow_pollster_packets(self):
|
||||
self._test_pollster(
|
||||
flow.FlowPollsterPackets,
|
||||
'switch.flow.packets',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'packet')
|
||||
|
||||
def test_flow_pollster_bytes(self):
|
||||
self._test_pollster(
|
||||
flow.FlowPollsterBytes,
|
||||
'switch.flow.bytes',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'B')
|
@ -61,59 +61,3 @@ class TestPortPollsters(statistics._PollsterTestBase):
|
||||
'switch.port.transmit.bytes',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'B')
|
||||
|
||||
def test_port_pollster_receive_drops(self):
|
||||
self._test_pollster(
|
||||
port.PortPollsterReceiveDrops,
|
||||
'switch.port.receive.drops',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'packet')
|
||||
|
||||
def test_port_pollster_transmit_drops(self):
|
||||
self._test_pollster(
|
||||
port.PortPollsterTransmitDrops,
|
||||
'switch.port.transmit.drops',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'packet')
|
||||
|
||||
def test_port_pollster_receive_errors(self):
|
||||
self._test_pollster(
|
||||
port.PortPollsterReceiveErrors,
|
||||
'switch.port.receive.errors',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'packet')
|
||||
|
||||
def test_port_pollster_transmit_errors(self):
|
||||
self._test_pollster(
|
||||
port.PortPollsterTransmitErrors,
|
||||
'switch.port.transmit.errors',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'packet')
|
||||
|
||||
def test_port_pollster_receive_frame_errors(self):
|
||||
self._test_pollster(
|
||||
port.PortPollsterReceiveFrameErrors,
|
||||
'switch.port.receive.frame_error',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'packet')
|
||||
|
||||
def test_port_pollster_receive_overrun_errors(self):
|
||||
self._test_pollster(
|
||||
port.PortPollsterReceiveOverrunErrors,
|
||||
'switch.port.receive.overrun_error',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'packet')
|
||||
|
||||
def test_port_pollster_receive_crc_errors(self):
|
||||
self._test_pollster(
|
||||
port.PortPollsterReceiveCRCErrors,
|
||||
'switch.port.receive.crc_error',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'packet')
|
||||
|
||||
def test_port_pollster_collision_count(self):
|
||||
self._test_pollster(
|
||||
port.PortPollsterCollisionCount,
|
||||
'switch.port.collision.count',
|
||||
sample.TYPE_CUMULATIVE,
|
||||
'packet')
|
||||
|
@ -1,49 +0,0 @@
|
||||
#
|
||||
# Copyright 2014 NEC Corporation. All rights reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from ceilometer.network.statistics import table
|
||||
from ceilometer import sample
|
||||
from ceilometer.tests.unit.network import statistics
|
||||
|
||||
|
||||
class TestTablePollsters(statistics._PollsterTestBase):
|
||||
|
||||
def test_table_pollster(self):
|
||||
self._test_pollster(
|
||||
table.TablePollster,
|
||||
'switch.table',
|
||||
sample.TYPE_GAUGE,
|
||||
'table')
|
||||
|
||||
def test_table_pollster_active_entries(self):
|
||||
self._test_pollster(
|
||||
table.TablePollsterActiveEntries,
|
||||
'switch.table.active.entries',
|
||||
sample.TYPE_GAUGE,
|
||||
'entry')
|
||||
|
||||
def test_table_pollster_lookup_packets(self):
|
||||
self._test_pollster(
|
||||
table.TablePollsterLookupPackets,
|
||||
'switch.table.lookup.packets',
|
||||
sample.TYPE_GAUGE,
|
||||
'packet')
|
||||
|
||||
def test_table_pollster_matched_packets(self):
|
||||
self._test_pollster(
|
||||
table.TablePollsterMatchedPackets,
|
||||
'switch.table.matched.packets',
|
||||
sample.TYPE_GAUGE,
|
||||
'packet')
|
@ -629,59 +629,6 @@ The following meters are collected for SDN:
|
||||
| switch.port.tr\ | Cumula\ | B | switch ID | Pollster | Bytes transmitt\|
|
||||
| ansmit.bytes | tive | | | | ed on port |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.port.re\ | Cumula\ | packet | switch ID | Pollster | Drops received |
|
||||
| ceive.drops | tive | | | | on port |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.port.tr\ | Cumula\ | packet | switch ID | Pollster | Drops transmitt\|
|
||||
| ansmit.drops | tive | | | | ed on port |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.port.re\ | Cumula\ | packet | switch ID | Pollster | Errors received |
|
||||
| ceive.errors | tive | | | | on port |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.port.tr\ | Cumula\ | packet | switch ID | Pollster | Errors transmit\|
|
||||
| ansmit.errors | tive | | | | ted on port |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.port.re\ | Cumula\ | packet | switch ID | Pollster | Frame alignment |
|
||||
| ceive.frame\_er\| tive | | | | errors receive\ |
|
||||
| ror | | | | | d on port |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.port.re\ | Cumula\ | packet | switch ID | Pollster | Overrun errors |
|
||||
| ceive.overrun\_\| tive | | | | received on port|
|
||||
| error | | | | | |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.port.re\ | Cumula\ | packet | switch ID | Pollster | CRC errors rece\|
|
||||
| ceive.crc\_error| tive | | | | ived on port |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.port.co\ | Cumula\ | count | switch ID | Pollster | Collisions on p\|
|
||||
| llision.count | tive | | | | ort |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.table | Gauge | table | switch ID | Pollster | Duration of tab\|
|
||||
| | | | | | le |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.table.a\ | Gauge | entry | switch ID | Pollster | Active entries |
|
||||
| ctive.entries | | | | | in table |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.table.l\ | Gauge | packet | switch ID | Pollster | Lookup packets |
|
||||
| ookup.packets | | | | | for table |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.table.m\ | Gauge | packet | switch ID | Pollster | Packets matches |
|
||||
| atched.packets | | | | | for table |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.flow | Gauge | flow | switch ID | Pollster | Duration of flow|
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.flow.du\ | Gauge | s | switch ID | Pollster | Duration of flow|
|
||||
| ration.seconds | | | | | in seconds |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.flow.du\ | Gauge | ns | switch ID | Pollster | Duration of flow|
|
||||
| ration.nanosec\ | | | | | in nanoseconds |
|
||||
| onds | | | | | |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.flow.pa\ | Cumula\ | packet | switch ID | Pollster | Packets received|
|
||||
| ckets | tive | | | | |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| switch.flow.by\ | Cumula\ | B | switch ID | Pollster | Bytes received |
|
||||
| tes | tive | | | | |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| **Meters added in the Pike release** |
|
||||
+-----------------+---------+--------+-----------+----------+-----------------+
|
||||
| port | Gauge | port | port ID | Pollster | Existence of po\|
|
||||
|
17
setup.cfg
17
setup.cfg
@ -145,25 +145,8 @@ ceilometer.poll.central =
|
||||
switch.port.transmit.packets = ceilometer.network.statistics.port:PortPollsterTransmitPackets
|
||||
switch.port.receive.bytes = ceilometer.network.statistics.port:PortPollsterReceiveBytes
|
||||
switch.port.transmit.bytes = ceilometer.network.statistics.port:PortPollsterTransmitBytes
|
||||
switch.port.receive.drops = ceilometer.network.statistics.port:PortPollsterReceiveDrops
|
||||
switch.port.transmit.drops = ceilometer.network.statistics.port:PortPollsterTransmitDrops
|
||||
switch.port.receive.errors = ceilometer.network.statistics.port:PortPollsterReceiveErrors
|
||||
switch.port.transmit.errors = ceilometer.network.statistics.port:PortPollsterTransmitErrors
|
||||
switch.port.receive.frame_error = ceilometer.network.statistics.port:PortPollsterReceiveFrameErrors
|
||||
switch.port.receive.overrun_error = ceilometer.network.statistics.port:PortPollsterReceiveOverrunErrors
|
||||
switch.port.receive.crc_error = ceilometer.network.statistics.port:PortPollsterReceiveCRCErrors
|
||||
switch.port.collision.count = ceilometer.network.statistics.port:PortPollsterCollisionCount
|
||||
switch.table = ceilometer.network.statistics.table:TablePollster
|
||||
switch.table.active.entries = ceilometer.network.statistics.table:TablePollsterActiveEntries
|
||||
switch.table.lookup.packets = ceilometer.network.statistics.table:TablePollsterLookupPackets
|
||||
switch.table.matched.packets = ceilometer.network.statistics.table:TablePollsterMatchedPackets
|
||||
switch = ceilometer.network.statistics.switch:SWPollster
|
||||
switch.ports = ceilometer.network.statistics.switch:SwitchPollsterPorts
|
||||
switch.flow = ceilometer.network.statistics.flow:FlowPollster
|
||||
switch.flow.bytes = ceilometer.network.statistics.flow:FlowPollsterBytes
|
||||
switch.flow.duration.nanoseconds = ceilometer.network.statistics.flow:FlowPollsterDurationNanoseconds
|
||||
switch.flow.duration.seconds = ceilometer.network.statistics.flow:FlowPollsterDurationSeconds
|
||||
switch.flow.packets = ceilometer.network.statistics.flow:FlowPollsterPackets
|
||||
network.services.vpn = ceilometer.network.services.vpnaas:VPNServicesPollster
|
||||
network.services.vpn.connections = ceilometer.network.services.vpnaas:IPSecConnectionsPollster
|
||||
network.services.firewall = ceilometer.network.services.fwaas:FirewallPollster
|
||||
|
Loading…
Reference in New Issue
Block a user