Remove OpenDaylight support
The feature was deprecated during the previous cycle[1], because
the netwokring-odl plugin[2] was already retired.
[1] a92d77b182
[2] https://opendev.org/openstack/networking-odl
Change-Id: I3437b73dea37f600a505f908c14e54536a40f588
This commit is contained in:
Takashi Kajinami
parent
3ebca0cc66
commit
c2de6a104a
|
|
@ -1,232 +0,0 @@
|
|||
#
|
||||
# Copyright 2013 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.
|
||||
|
||||
import abc
|
||||
from oslo_log import log
|
||||
import requests
|
||||
from requests import auth
|
||||
|
||||
from ceilometer.i18n import _
|
||||
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
class _Base(object, metaclass=abc.ABCMeta):
|
||||
"""Base class of OpenDaylight REST APIs Clients."""
|
||||
|
||||
@property
|
||||
@abc.abstractmethod
|
||||
def base_url(self):
|
||||
"""Returns base url for each REST API."""
|
||||
|
||||
def __init__(self, client):
|
||||
self.client = client
|
||||
|
||||
def request(self, path, container_name):
|
||||
return self.client.request(self.base_url + path, container_name)
|
||||
|
||||
|
||||
class OpenDaylightRESTAPIFailed(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class StatisticsAPIClient(_Base):
|
||||
"""OpenDaylight Statistics REST API Client
|
||||
|
||||
Base URL:
|
||||
{endpoint}/statistics/{containerName}
|
||||
"""
|
||||
|
||||
base_url = '/statistics/%(container_name)s'
|
||||
|
||||
def get_port_statistics(self, container_name):
|
||||
"""Get port statistics
|
||||
|
||||
URL:
|
||||
{Base URL}/port
|
||||
"""
|
||||
return self.request('/port', container_name)
|
||||
|
||||
def get_flow_statistics(self, container_name):
|
||||
"""Get flow statistics
|
||||
|
||||
URL:
|
||||
{Base URL}/flow
|
||||
"""
|
||||
return self.request('/flow', container_name)
|
||||
|
||||
def get_table_statistics(self, container_name):
|
||||
"""Get table statistics
|
||||
|
||||
URL:
|
||||
{Base URL}/table
|
||||
"""
|
||||
return self.request('/table', container_name)
|
||||
|
||||
|
||||
class TopologyAPIClient(_Base):
|
||||
"""OpenDaylight Topology REST API Client
|
||||
|
||||
Base URL:
|
||||
{endpoint}/topology/{containerName}
|
||||
"""
|
||||
|
||||
base_url = '/topology/%(container_name)s'
|
||||
|
||||
def get_topology(self, container_name):
|
||||
"""Get topology
|
||||
|
||||
URL:
|
||||
{Base URL}
|
||||
"""
|
||||
return self.request('', container_name)
|
||||
|
||||
def get_user_links(self, container_name):
|
||||
"""Get user links
|
||||
|
||||
URL:
|
||||
{Base URL}/userLinks
|
||||
"""
|
||||
return self.request('/userLinks', container_name)
|
||||
|
||||
|
||||
class SwitchManagerAPIClient(_Base):
|
||||
"""OpenDaylight Switch Manager REST API Client
|
||||
|
||||
Base URL:
|
||||
{endpoint}/switchmanager/{containerName}
|
||||
"""
|
||||
|
||||
base_url = '/switchmanager/%(container_name)s'
|
||||
|
||||
def get_nodes(self, container_name):
|
||||
"""Get node information
|
||||
|
||||
URL:
|
||||
{Base URL}/nodes
|
||||
"""
|
||||
return self.request('/nodes', container_name)
|
||||
|
||||
|
||||
class HostTrackerAPIClient(_Base):
|
||||
"""OpenDaylight Host Tracker REST API Client
|
||||
|
||||
Base URL:
|
||||
{endpoint}/hosttracker/{containerName}
|
||||
"""
|
||||
|
||||
base_url = '/hosttracker/%(container_name)s'
|
||||
|
||||
def get_active_hosts(self, container_name):
|
||||
"""Get active hosts information
|
||||
|
||||
URL:
|
||||
{Base URL}/hosts/active
|
||||
"""
|
||||
return self.request('/hosts/active', container_name)
|
||||
|
||||
def get_inactive_hosts(self, container_name):
|
||||
"""Get inactive hosts information
|
||||
|
||||
URL:
|
||||
{Base URL}/hosts/inactive
|
||||
"""
|
||||
return self.request('/hosts/inactive', container_name)
|
||||
|
||||
|
||||
class Client(object):
|
||||
|
||||
def __init__(self, conf, endpoint, params):
|
||||
self.statistics = StatisticsAPIClient(self)
|
||||
self.topology = TopologyAPIClient(self)
|
||||
self.switch_manager = SwitchManagerAPIClient(self)
|
||||
self.host_tracker = HostTrackerAPIClient(self)
|
||||
|
||||
self._endpoint = endpoint
|
||||
self.conf = conf
|
||||
|
||||
self._req_params = self._get_req_params(params)
|
||||
|
||||
def _get_req_params(self, params):
|
||||
req_params = {
|
||||
'headers': {
|
||||
'Accept': 'application/json'
|
||||
},
|
||||
'timeout': self.conf.http_timeout,
|
||||
}
|
||||
|
||||
auth_way = params.get('auth')
|
||||
if auth_way in ['basic', 'digest']:
|
||||
user = params.get('user')
|
||||
password = params.get('password')
|
||||
|
||||
if auth_way == 'basic':
|
||||
auth_class = auth.HTTPBasicAuth
|
||||
else:
|
||||
auth_class = auth.HTTPDigestAuth
|
||||
|
||||
req_params['auth'] = auth_class(user, password)
|
||||
return req_params
|
||||
|
||||
def _log_req(self, url):
|
||||
|
||||
curl_command = ['REQ: curl -i -X GET ', '"%s" ' % (url)]
|
||||
|
||||
if 'auth' in self._req_params:
|
||||
auth_class = self._req_params['auth']
|
||||
if isinstance(auth_class, auth.HTTPBasicAuth):
|
||||
curl_command.append('--basic ')
|
||||
else:
|
||||
curl_command.append('--digest ')
|
||||
|
||||
curl_command.append('--user "%s":"***" ' % auth_class.username)
|
||||
|
||||
for name, value in self._req_params['headers'].items():
|
||||
curl_command.append('-H "%s: %s" ' % (name, value))
|
||||
|
||||
LOG.debug(''.join(curl_command))
|
||||
|
||||
@staticmethod
|
||||
def _log_res(resp):
|
||||
|
||||
dump = ['RES: \n', 'HTTP %.1f %s %s\n' % (resp.raw.version,
|
||||
resp.status_code,
|
||||
resp.reason)]
|
||||
dump.extend('%s: %s\n' % (k, v)
|
||||
for k, v in resp.headers.items())
|
||||
dump.append('\n')
|
||||
if resp.content:
|
||||
dump.extend([resp.content, '\n'])
|
||||
|
||||
LOG.debug(''.join(dump))
|
||||
|
||||
def _http_request(self, url):
|
||||
if self.conf.debug:
|
||||
self._log_req(url)
|
||||
resp = requests.get(url, **self._req_params)
|
||||
if self.conf.debug:
|
||||
self._log_res(resp)
|
||||
if resp.status_code // 100 != 2:
|
||||
raise OpenDaylightRESTAPIFailed(
|
||||
_('OpenDaylight API returned %(status)s %(reason)s') %
|
||||
{'status': resp.status_code, 'reason': resp.reason})
|
||||
|
||||
return resp.json()
|
||||
|
||||
def request(self, path, container_name):
|
||||
|
||||
url = self._endpoint + path % {'container_name': container_name}
|
||||
return self._http_request(url)
|
||||
|
|
@ -1,472 +0,0 @@
|
|||
#
|
||||
# Copyright 2013 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.
|
||||
|
||||
import warnings
|
||||
|
||||
from oslo_log import log
|
||||
from urllib import parse as urlparse
|
||||
|
||||
from ceilometer.network.statistics import driver
|
||||
from ceilometer.network.statistics.opendaylight import client
|
||||
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
def _get_properties(properties, prefix='properties'):
|
||||
resource_meta = {}
|
||||
if properties is not None:
|
||||
for k, v in properties.items():
|
||||
value = v['value']
|
||||
key = prefix + '_' + k
|
||||
if 'name' in v:
|
||||
key += '_' + v['name']
|
||||
resource_meta[key] = value
|
||||
return resource_meta
|
||||
|
||||
|
||||
def _get_int_sample(key, statistic, resource_id, resource_meta):
|
||||
if key not in statistic:
|
||||
return None
|
||||
return int(statistic[key]), resource_id, resource_meta
|
||||
|
||||
|
||||
class OpenDayLightDriver(driver.Driver):
|
||||
"""Driver of network info collector from OpenDaylight.
|
||||
|
||||
This driver uses resources in "pipeline.yaml".
|
||||
Resource requires below conditions:
|
||||
|
||||
* resource is url
|
||||
* scheme is "opendaylight"
|
||||
|
||||
This driver can be configured via query parameters.
|
||||
Supported parameters:
|
||||
|
||||
* scheme:
|
||||
The scheme of request url to OpenDaylight REST API endpoint.
|
||||
(default http)
|
||||
* auth:
|
||||
Auth strategy of http.
|
||||
This parameter can be set basic and digest.(default None)
|
||||
* user:
|
||||
This is username that is used by auth.(default None)
|
||||
* password:
|
||||
This is password that is used by auth.(default None)
|
||||
* container_name:
|
||||
Name of container of OpenDaylight.(default "default")
|
||||
This parameter allows multi values.
|
||||
|
||||
e.g.::
|
||||
|
||||
opendaylight://127.0.0.1:8080/controller/nb/v2?container_name=default&
|
||||
container_name=egg&auth=basic&user=admin&password=admin&scheme=http
|
||||
|
||||
In this case, the driver send request to below URLs:
|
||||
|
||||
http://127.0.0.1:8080/controller/nb/v2/statistics/default/flow
|
||||
http://127.0.0.1:8080/controller/nb/v2/statistics/egg/flow
|
||||
"""
|
||||
def __init__(self, conf):
|
||||
warnings.warn('Support for OpenDaylight is deprecated.',
|
||||
category=DeprecationWarning, stacklevel=2)
|
||||
super(OpenDayLightDriver, self).__init__(conf)
|
||||
|
||||
def _prepare_cache(self, endpoint, params, cache):
|
||||
|
||||
if 'network.statistics.opendaylight' in cache:
|
||||
return cache['network.statistics.opendaylight']
|
||||
|
||||
data = {}
|
||||
|
||||
container_names = params.get('container_name', ['default'])
|
||||
|
||||
odl_params = {}
|
||||
if 'auth' in params:
|
||||
odl_params['auth'] = params['auth'][0]
|
||||
if 'user' in params:
|
||||
odl_params['user'] = params['user'][0]
|
||||
if 'password' in params:
|
||||
odl_params['password'] = params['password'][0]
|
||||
cs = client.Client(self.conf, endpoint, odl_params)
|
||||
|
||||
for container_name in container_names:
|
||||
try:
|
||||
container_data = {}
|
||||
|
||||
# get flow statistics
|
||||
container_data['flow'] = cs.statistics.get_flow_statistics(
|
||||
container_name)
|
||||
|
||||
# get port statistics
|
||||
container_data['port'] = cs.statistics.get_port_statistics(
|
||||
container_name)
|
||||
|
||||
# get table statistics
|
||||
container_data['table'] = cs.statistics.get_table_statistics(
|
||||
container_name)
|
||||
|
||||
# get topology
|
||||
container_data['topology'] = cs.topology.get_topology(
|
||||
container_name)
|
||||
|
||||
# get switch information
|
||||
container_data['switch'] = cs.switch_manager.get_nodes(
|
||||
container_name)
|
||||
|
||||
# get and optimize user links
|
||||
# e.g.
|
||||
# before:
|
||||
# "OF|2@OF|00:00:00:00:00:00:00:02"
|
||||
# after:
|
||||
# {
|
||||
# 'port': {
|
||||
# 'type': 'OF',
|
||||
# 'id': '2'},
|
||||
# 'node': {
|
||||
# 'type': 'OF',
|
||||
# 'id': '00:00:00:00:00:00:00:02'
|
||||
# }
|
||||
# }
|
||||
user_links_raw = cs.topology.get_user_links(container_name)
|
||||
user_links = []
|
||||
container_data['user_links'] = user_links
|
||||
for user_link_row in user_links_raw['userLinks']:
|
||||
user_link = {}
|
||||
for k, v in user_link_row.items():
|
||||
if (k == "dstNodeConnector" or
|
||||
k == "srcNodeConnector"):
|
||||
port_raw, node_raw = v.split('@')
|
||||
port = {}
|
||||
port['type'], port['id'] = port_raw.split('|')
|
||||
node = {}
|
||||
node['type'], node['id'] = node_raw.split('|')
|
||||
v = {'port': port, 'node': node}
|
||||
user_link[k] = v
|
||||
user_links.append(user_link)
|
||||
|
||||
# get link status to hosts
|
||||
container_data['active_hosts'] = (
|
||||
cs.host_tracker.get_active_hosts(container_name))
|
||||
container_data['inactive_hosts'] = (
|
||||
cs.host_tracker.get_inactive_hosts(container_name))
|
||||
data[container_name] = container_data
|
||||
except Exception:
|
||||
LOG.exception('Request failed to connect to OpenDaylight'
|
||||
' with NorthBound REST API')
|
||||
|
||||
cache['network.statistics.opendaylight'] = data
|
||||
|
||||
return data
|
||||
|
||||
def get_sample_data(self, meter_name, parse_url, params, cache):
|
||||
|
||||
extractor = self._get_extractor(meter_name)
|
||||
if extractor is None:
|
||||
# The way to getting meter is not implemented in this driver or
|
||||
# OpenDaylight REST API has not api to getting meter.
|
||||
return None
|
||||
|
||||
iter = self._get_iter(meter_name)
|
||||
if iter is None:
|
||||
# The way to getting meter is not implemented in this driver or
|
||||
# OpenDaylight REST API has not api to getting meter.
|
||||
return None
|
||||
|
||||
parts = urlparse.ParseResult(params.get('scheme', ['http'])[0],
|
||||
parse_url.netloc,
|
||||
parse_url.path,
|
||||
None,
|
||||
None,
|
||||
None)
|
||||
endpoint = urlparse.urlunparse(parts)
|
||||
|
||||
data = self._prepare_cache(endpoint, params, cache)
|
||||
|
||||
samples = []
|
||||
for name, value in data.items():
|
||||
for sample in iter(extractor, value):
|
||||
if sample is not None:
|
||||
# set controller name and container name
|
||||
# to resource_metadata
|
||||
sample[2]['controller'] = 'OpenDaylight'
|
||||
sample[2]['container'] = name
|
||||
|
||||
samples.append(sample + (None, ))
|
||||
|
||||
return samples
|
||||
|
||||
def _get_iter(self, meter_name):
|
||||
if meter_name == 'switch':
|
||||
return self._iter_switch
|
||||
elif meter_name.startswith('switch.flow'):
|
||||
return self._iter_flow
|
||||
elif meter_name.startswith('switch.table'):
|
||||
return self._iter_table
|
||||
elif meter_name.startswith('switch.port'):
|
||||
return self._iter_port
|
||||
|
||||
def _get_extractor(self, meter_name):
|
||||
method_name = '_' + meter_name.replace('.', '_')
|
||||
return getattr(self, method_name, None)
|
||||
|
||||
@staticmethod
|
||||
def _iter_switch(extractor, data):
|
||||
for switch in data['switch']['nodeProperties']:
|
||||
yield extractor(switch, switch['node']['id'], {})
|
||||
|
||||
@staticmethod
|
||||
def _switch(statistic, resource_id, resource_meta):
|
||||
|
||||
resource_meta.update(_get_properties(statistic.get('properties')))
|
||||
|
||||
return 1, resource_id, resource_meta
|
||||
|
||||
@staticmethod
|
||||
def _iter_port(extractor, data):
|
||||
for port_statistic in data['port']['portStatistics']:
|
||||
for statistic in port_statistic['portStatistic']:
|
||||
resource_meta = {'port': statistic['nodeConnector']['id']}
|
||||
yield extractor(statistic, port_statistic['node']['id'],
|
||||
resource_meta, data)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port(statistic, resource_id, resource_meta, data):
|
||||
my_node_id = resource_id
|
||||
my_port_id = statistic['nodeConnector']['id']
|
||||
|
||||
# link status from topology
|
||||
edge_properties = data['topology']['edgeProperties']
|
||||
for edge_property in edge_properties:
|
||||
edge = edge_property['edge']
|
||||
|
||||
if (edge['headNodeConnector']['node']['id'] == my_node_id and
|
||||
edge['headNodeConnector']['id'] == my_port_id):
|
||||
target_node = edge['tailNodeConnector']
|
||||
elif (edge['tailNodeConnector']['node']['id'] == my_node_id and
|
||||
edge['tailNodeConnector']['id'] == my_port_id):
|
||||
target_node = edge['headNodeConnector']
|
||||
else:
|
||||
continue
|
||||
|
||||
resource_meta['topology_node_id'] = target_node['node']['id']
|
||||
resource_meta['topology_node_port'] = target_node['id']
|
||||
|
||||
resource_meta.update(_get_properties(
|
||||
edge_property.get('properties'),
|
||||
prefix='topology'))
|
||||
|
||||
break
|
||||
|
||||
# link status from user links
|
||||
for user_link in data['user_links']:
|
||||
if (user_link['dstNodeConnector']['node']['id'] == my_node_id and
|
||||
user_link['dstNodeConnector']['port']['id'] == my_port_id):
|
||||
target_node = user_link['srcNodeConnector']
|
||||
elif (user_link['srcNodeConnector']['node']['id'] == my_node_id and
|
||||
user_link['srcNodeConnector']['port']['id'] == my_port_id):
|
||||
target_node = user_link['dstNodeConnector']
|
||||
else:
|
||||
continue
|
||||
|
||||
resource_meta['user_link_node_id'] = target_node['node']['id']
|
||||
resource_meta['user_link_node_port'] = target_node['port']['id']
|
||||
resource_meta['user_link_status'] = user_link['status']
|
||||
resource_meta['user_link_name'] = user_link['name']
|
||||
|
||||
break
|
||||
|
||||
# link status to hosts
|
||||
for hosts, status in zip(
|
||||
[data['active_hosts'], data['inactive_hosts']],
|
||||
['active', 'inactive']):
|
||||
for host_config in hosts['hostConfig']:
|
||||
if (host_config['nodeId'] != my_node_id or
|
||||
host_config['nodeConnectorId'] != my_port_id):
|
||||
continue
|
||||
|
||||
resource_meta['host_status'] = status
|
||||
for key in ['dataLayerAddress', 'vlan', 'staticHost',
|
||||
'networkAddress']:
|
||||
if key in host_config:
|
||||
resource_meta['host_' + key] = host_config[key]
|
||||
|
||||
break
|
||||
|
||||
return 1, resource_id, resource_meta
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_receive_packets(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('receivePackets', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_transmit_packets(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('transmitPackets', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_receive_bytes(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('receiveBytes', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_transmit_bytes(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('transmitBytes', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_receive_drops(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('receiveDrops', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_transmit_drops(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('transmitDrops', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_receive_errors(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('receiveErrors', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_transmit_errors(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('transmitErrors', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_receive_frame_error(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('receiveFrameError', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_receive_overrun_error(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('receiveOverRunError', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_receive_crc_error(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('receiveCrcError', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_port_collision_count(statistic, resource_id,
|
||||
resource_meta, data):
|
||||
return _get_int_sample('collisionCount', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _iter_table(extractor, data):
|
||||
for table_statistic in data['table']['tableStatistics']:
|
||||
for statistic in table_statistic['tableStatistic']:
|
||||
resource_meta = {'table_id': statistic['nodeTable']['id']}
|
||||
yield extractor(statistic,
|
||||
table_statistic['node']['id'],
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_table(statistic, resource_id, resource_meta):
|
||||
return 1, resource_id, resource_meta
|
||||
|
||||
@staticmethod
|
||||
def _switch_table_active_entries(statistic, resource_id,
|
||||
resource_meta):
|
||||
return _get_int_sample('activeCount', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_table_lookup_packets(statistic, resource_id,
|
||||
resource_meta):
|
||||
return _get_int_sample('lookupCount', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_table_matched_packets(statistic, resource_id,
|
||||
resource_meta):
|
||||
return _get_int_sample('matchedCount', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
def dict_to_keyval(self, value, key_base=None):
|
||||
"""Expand a given dict to its corresponding key-value pairs.
|
||||
|
||||
Generated keys are fully qualified, delimited using dot notation.
|
||||
ie. key = 'key.child_key.grandchild_key[0]'
|
||||
"""
|
||||
val_iter, key_func = None, None
|
||||
if isinstance(value, dict):
|
||||
val_iter = value.items()
|
||||
key_func = lambda k: key_base + '.' + k if key_base else k # noqa
|
||||
elif isinstance(value, (tuple, list)):
|
||||
val_iter = enumerate(value)
|
||||
key_func = lambda k: key_base + '[%d]' % k # noqa: E731
|
||||
|
||||
if val_iter:
|
||||
for k, v in val_iter:
|
||||
key_gen = key_func(k)
|
||||
if isinstance(v, dict) or isinstance(v, (tuple, list)):
|
||||
for key_gen, v in self.dict_to_keyval(v, key_gen):
|
||||
yield key_gen, v
|
||||
else:
|
||||
yield key_gen, v
|
||||
|
||||
def _iter_flow(self, extractor, data):
|
||||
for flow_statistic in data['flow']['flowStatistics']:
|
||||
for statistic in flow_statistic['flowStatistic']:
|
||||
resource_meta = {'flow_id': statistic['flow']['id'],
|
||||
'table_id': statistic['tableId']}
|
||||
for key, value in self.dict_to_keyval(statistic['flow'],
|
||||
'flow'):
|
||||
resource_meta[key.replace('.', '_')] = value
|
||||
yield extractor(statistic,
|
||||
flow_statistic['node']['id'],
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_flow(statistic, resource_id, resource_meta):
|
||||
return 1, resource_id, resource_meta
|
||||
|
||||
@staticmethod
|
||||
def _switch_flow_duration_seconds(statistic, resource_id,
|
||||
resource_meta):
|
||||
return _get_int_sample('durationSeconds', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_flow_duration_nanoseconds(statistic, resource_id,
|
||||
resource_meta):
|
||||
return _get_int_sample('durationNanoseconds', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_flow_packets(statistic, resource_id, resource_meta):
|
||||
return _get_int_sample('packetCount', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
||||
@staticmethod
|
||||
def _switch_flow_bytes(statistic, resource_id, resource_meta):
|
||||
return _get_int_sample('byteCount', statistic, resource_id,
|
||||
resource_meta)
|
||||
|
|
@ -1,176 +0,0 @@
|
|||
#
|
||||
# Copyright 2013 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 unittest import mock
|
||||
|
||||
from oslo_config import fixture as config_fixture
|
||||
from oslotest import base
|
||||
from requests import auth as req_auth
|
||||
from urllib import parse as urlparse
|
||||
|
||||
from ceilometer.i18n import _
|
||||
from ceilometer.network.statistics.opendaylight import client
|
||||
from ceilometer import service as ceilometer_service
|
||||
|
||||
|
||||
class TestClientHTTPBasicAuth(base.BaseTestCase):
|
||||
|
||||
auth_way = 'basic'
|
||||
scheme = 'http'
|
||||
|
||||
def setUp(self):
|
||||
super(TestClientHTTPBasicAuth, self).setUp()
|
||||
conf = ceilometer_service.prepare_service(argv=[], config_files=[])
|
||||
self.CONF = self.useFixture(config_fixture.Config(conf)).conf
|
||||
self.parsed_url = urlparse.urlparse(
|
||||
'http://127.0.0.1:8080/controller/nb/v2?container_name=default&'
|
||||
'container_name=egg&auth=%s&user=admin&password=admin_pass&'
|
||||
'scheme=%s' % (self.auth_way, self.scheme))
|
||||
self.params = urlparse.parse_qs(self.parsed_url.query)
|
||||
self.endpoint = urlparse.urlunparse(
|
||||
urlparse.ParseResult(self.scheme,
|
||||
self.parsed_url.netloc,
|
||||
self.parsed_url.path,
|
||||
None, None, None))
|
||||
odl_params = {'auth': self.params.get('auth')[0],
|
||||
'user': self.params.get('user')[0],
|
||||
'password': self.params.get('password')[0]}
|
||||
self.client = client.Client(self.CONF, self.endpoint, odl_params)
|
||||
|
||||
self.resp = mock.MagicMock()
|
||||
self.get = mock.patch('requests.get',
|
||||
return_value=self.resp).start()
|
||||
|
||||
self.resp.raw.version = 1.1
|
||||
self.resp.status_code = 200
|
||||
self.resp.reason = 'OK'
|
||||
self.resp.headers = {}
|
||||
self.resp.content = 'dummy'
|
||||
|
||||
def _test_request(self, method, url):
|
||||
data = method('default')
|
||||
|
||||
call_args = self.get.call_args_list[0][0]
|
||||
call_kwargs = self.get.call_args_list[0][1]
|
||||
|
||||
# check url
|
||||
real_url = url % {'container_name': 'default',
|
||||
'scheme': self.scheme}
|
||||
self.assertEqual(real_url, call_args[0])
|
||||
|
||||
# check auth parameters
|
||||
auth = call_kwargs.get('auth')
|
||||
if self.auth_way == 'digest':
|
||||
self.assertIsInstance(auth, req_auth.HTTPDigestAuth)
|
||||
else:
|
||||
self.assertIsInstance(auth, req_auth.HTTPBasicAuth)
|
||||
self.assertEqual('admin', auth.username)
|
||||
self.assertEqual('admin_pass', auth.password)
|
||||
|
||||
# check header
|
||||
self.assertEqual(
|
||||
{'Accept': 'application/json'},
|
||||
call_kwargs['headers'])
|
||||
|
||||
# check return value
|
||||
self.assertEqual(self.get().json(), data)
|
||||
|
||||
def test_flow_statistics(self):
|
||||
self._test_request(
|
||||
self.client.statistics.get_flow_statistics,
|
||||
'%(scheme)s://127.0.0.1:8080/controller/nb/v2'
|
||||
'/statistics/%(container_name)s/flow')
|
||||
|
||||
def test_port_statistics(self):
|
||||
self._test_request(
|
||||
self.client.statistics.get_port_statistics,
|
||||
'%(scheme)s://127.0.0.1:8080/controller/nb/v2'
|
||||
'/statistics/%(container_name)s/port')
|
||||
|
||||
def test_table_statistics(self):
|
||||
self._test_request(
|
||||
self.client.statistics.get_table_statistics,
|
||||
'%(scheme)s://127.0.0.1:8080/controller/nb/v2'
|
||||
'/statistics/%(container_name)s/table')
|
||||
|
||||
def test_topology(self):
|
||||
self._test_request(
|
||||
self.client.topology.get_topology,
|
||||
'%(scheme)s://127.0.0.1:8080/controller/nb/v2'
|
||||
'/topology/%(container_name)s')
|
||||
|
||||
def test_user_links(self):
|
||||
self._test_request(
|
||||
self.client.topology.get_user_links,
|
||||
'%(scheme)s://127.0.0.1:8080/controller/nb/v2'
|
||||
'/topology/%(container_name)s/userLinks')
|
||||
|
||||
def test_switch(self):
|
||||
self._test_request(
|
||||
self.client.switch_manager.get_nodes,
|
||||
'%(scheme)s://127.0.0.1:8080/controller/nb/v2'
|
||||
'/switchmanager/%(container_name)s/nodes')
|
||||
|
||||
def test_active_hosts(self):
|
||||
self._test_request(
|
||||
self.client.host_tracker.get_active_hosts,
|
||||
'%(scheme)s://127.0.0.1:8080/controller/nb/v2'
|
||||
'/hosttracker/%(container_name)s/hosts/active')
|
||||
|
||||
def test_inactive_hosts(self):
|
||||
self._test_request(
|
||||
self.client.host_tracker.get_inactive_hosts,
|
||||
'%(scheme)s://127.0.0.1:8080/controller/nb/v2'
|
||||
'/hosttracker/%(container_name)s/hosts/inactive')
|
||||
|
||||
def test_http_error(self):
|
||||
self.resp.status_code = 404
|
||||
self.resp.reason = 'Not Found'
|
||||
|
||||
try:
|
||||
self.client.statistics.get_flow_statistics('default')
|
||||
self.fail('')
|
||||
except client.OpenDaylightRESTAPIFailed as e:
|
||||
self.assertEqual(
|
||||
_('OpenDaylight API returned %(status)s %(reason)s') %
|
||||
{'status': self.resp.status_code,
|
||||
'reason': self.resp.reason},
|
||||
str(e))
|
||||
|
||||
def test_other_error(self):
|
||||
|
||||
class _Exception(Exception):
|
||||
pass
|
||||
|
||||
self.get = mock.patch('requests.get',
|
||||
side_effect=_Exception).start()
|
||||
|
||||
self.assertRaises(_Exception,
|
||||
self.client.statistics.get_flow_statistics,
|
||||
'default')
|
||||
|
||||
|
||||
class TestClientHTTPDigestAuth(TestClientHTTPBasicAuth):
|
||||
|
||||
auth_way = 'digest'
|
||||
|
||||
|
||||
class TestClientHTTPSBasicAuth(TestClientHTTPBasicAuth):
|
||||
|
||||
scheme = 'https'
|
||||
|
||||
|
||||
class TestClientHTTPSDigestAuth(TestClientHTTPDigestAuth):
|
||||
|
||||
scheme = 'https'
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
Support for OpenDaylight has been removed.
|
||||
|
|
@ -215,7 +215,6 @@ console_scripts =
|
|||
ceilometer-status = ceilometer.cmd.status:main
|
||||
|
||||
network.statistics.drivers =
|
||||
opendaylight = ceilometer.network.statistics.opendaylight.driver:OpenDayLightDriver
|
||||
opencontrail = ceilometer.network.statistics.opencontrail.driver:OpencontrailDriver
|
||||
|
||||
oslo.config.opts =
|
||||
|
|
|
|||
Loading…
Reference in New Issue