Merge "Fix Opencontrail pollster according the API changes"
This commit is contained in:
commit
5042b2da73
@ -14,6 +14,8 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import copy
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
import requests
|
import requests
|
||||||
import six
|
import six
|
||||||
@ -37,53 +39,22 @@ class OpencontrailAPIFailed(Exception):
|
|||||||
class AnalyticsAPIBaseClient(object):
|
class AnalyticsAPIBaseClient(object):
|
||||||
"""Opencontrail Base Statistics REST API Client."""
|
"""Opencontrail Base Statistics REST API Client."""
|
||||||
|
|
||||||
def __init__(self, endpoint, username, password, domain, verify_ssl=True):
|
def __init__(self, endpoint, data):
|
||||||
self.endpoint = endpoint
|
self.endpoint = endpoint
|
||||||
self.username = username
|
self.data = data or {}
|
||||||
self.password = password
|
|
||||||
self.domain = domain
|
|
||||||
self.verify_ssl = verify_ssl
|
|
||||||
self.sid = None
|
|
||||||
|
|
||||||
def authenticate(self):
|
def request(self, path, fqdn_uuid, data=None):
|
||||||
path = '/authenticate'
|
req_data = copy.copy(self.data)
|
||||||
data = {'username': self.username,
|
if data:
|
||||||
'password': self.password,
|
req_data.update(data)
|
||||||
'domain': self.domain}
|
|
||||||
|
|
||||||
req_params = self._get_req_params(data=data)
|
req_params = self._get_req_params(data=req_data)
|
||||||
url = urlparse.urljoin(self.endpoint, path)
|
|
||||||
resp = requests.post(url, **req_params)
|
|
||||||
if resp.status_code != 302:
|
|
||||||
raise OpencontrailAPIFailed(
|
|
||||||
_('Opencontrail API returned %(status)s %(reason)s') %
|
|
||||||
{'status': resp.status_code, 'reason': resp.reason})
|
|
||||||
self.sid = resp.cookies['connect.sid']
|
|
||||||
|
|
||||||
def request(self, path, fqdn_uuid, data, retry=True):
|
url = urlparse.urljoin(self.endpoint, path + fqdn_uuid)
|
||||||
if not self.sid:
|
|
||||||
self.authenticate()
|
|
||||||
|
|
||||||
if not data:
|
|
||||||
data = {'fqnUUID': fqdn_uuid}
|
|
||||||
else:
|
|
||||||
data['fqnUUID'] = fqdn_uuid
|
|
||||||
|
|
||||||
req_params = self._get_req_params(data=data,
|
|
||||||
cookies={'connect.sid': self.sid})
|
|
||||||
|
|
||||||
url = urlparse.urljoin(self.endpoint, path)
|
|
||||||
self._log_req(url, req_params)
|
self._log_req(url, req_params)
|
||||||
resp = requests.get(url, **req_params)
|
resp = requests.get(url, **req_params)
|
||||||
self._log_res(resp)
|
self._log_res(resp)
|
||||||
|
|
||||||
# it seems that the sid token has to be renewed
|
|
||||||
if resp.status_code == 302:
|
|
||||||
self.sid = 0
|
|
||||||
if retry:
|
|
||||||
return self.request(path, fqdn_uuid, data,
|
|
||||||
retry=False)
|
|
||||||
|
|
||||||
if resp.status_code != 200:
|
if resp.status_code != 200:
|
||||||
raise OpencontrailAPIFailed(
|
raise OpencontrailAPIFailed(
|
||||||
_('Opencontrail API returned %(status)s %(reason)s') %
|
_('Opencontrail API returned %(status)s %(reason)s') %
|
||||||
@ -91,15 +62,13 @@ class AnalyticsAPIBaseClient(object):
|
|||||||
|
|
||||||
return resp
|
return resp
|
||||||
|
|
||||||
def _get_req_params(self, params=None, data=None, cookies=None):
|
def _get_req_params(self, data=None):
|
||||||
req_params = {
|
req_params = {
|
||||||
'headers': {
|
'headers': {
|
||||||
'Accept': 'application/json'
|
'Accept': 'application/json'
|
||||||
},
|
},
|
||||||
'data': data,
|
'data': data,
|
||||||
'verify': self.verify_ssl,
|
|
||||||
'allow_redirects': False,
|
'allow_redirects': False,
|
||||||
'cookies': cookies,
|
|
||||||
'timeout': CONF.http_timeout,
|
'timeout': CONF.http_timeout,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -143,24 +112,20 @@ class AnalyticsAPIBaseClient(object):
|
|||||||
class NetworksAPIClient(AnalyticsAPIBaseClient):
|
class NetworksAPIClient(AnalyticsAPIBaseClient):
|
||||||
"""Opencontrail Statistics REST API Client."""
|
"""Opencontrail Statistics REST API Client."""
|
||||||
|
|
||||||
def get_port_statistics(self, fqdn_uuid):
|
def get_vm_statistics(self, fqdn_uuid, data=None):
|
||||||
"""Get port statistics of a network
|
"""Get statistics of a virtual-machines.
|
||||||
|
|
||||||
URL:
|
URL:
|
||||||
/tenant/networking/virtual-machines/details
|
{endpoint}/analytics/uves/virtual-machine/{fqdn_uuid}
|
||||||
PARAMS:
|
|
||||||
fqdnUUID=fqdn_uuid
|
|
||||||
type=vn
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
path = '/api/tenant/networking/virtual-machines/details'
|
path = '/analytics/uves/virtual-machine/'
|
||||||
resp = self.request(path, fqdn_uuid, {'type': 'vn'})
|
resp = self.request(path, fqdn_uuid, data)
|
||||||
|
|
||||||
return resp.json()
|
return resp.json()
|
||||||
|
|
||||||
|
|
||||||
class Client(object):
|
class Client(object):
|
||||||
|
|
||||||
def __init__(self, endpoint, username, password, domain, verify_ssl=True):
|
def __init__(self, endpoint, data=None):
|
||||||
self.networks = NetworksAPIClient(endpoint, username, password,
|
self.networks = NetworksAPIClient(endpoint, data)
|
||||||
domain, verify_ssl)
|
|
||||||
|
@ -13,6 +13,9 @@
|
|||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
|
|
||||||
@ -25,6 +28,7 @@ class OpencontrailDriver(driver.Driver):
|
|||||||
"""Driver of network analytics of Opencontrail.
|
"""Driver of network analytics of Opencontrail.
|
||||||
|
|
||||||
This driver uses resources in "pipeline.yaml".
|
This driver uses resources in "pipeline.yaml".
|
||||||
|
|
||||||
Resource requires below conditions:
|
Resource requires below conditions:
|
||||||
|
|
||||||
* resource is url
|
* resource is url
|
||||||
@ -35,21 +39,26 @@ class OpencontrailDriver(driver.Driver):
|
|||||||
|
|
||||||
* scheme:
|
* scheme:
|
||||||
The scheme of request url to Opencontrail Analytics endpoint.
|
The scheme of request url to Opencontrail Analytics endpoint.
|
||||||
(default http)
|
(default "http")
|
||||||
* username:
|
* virtual_network
|
||||||
This is username used by Opencontrail Analytics.(default None)
|
Specify the virtual network.
|
||||||
* password:
|
(default None)
|
||||||
This is password used by Opencontrail Analytics.(default None)
|
* fqdn_uuid:
|
||||||
* domain:
|
Specify the VM fqdn UUID.
|
||||||
This is domain used by Opencontrail Analytics.(default None)
|
(default "*")
|
||||||
* verify_ssl:
|
* resource:
|
||||||
Specify if the certificate will be checked for https request.
|
The resource on which the counters are retrieved.
|
||||||
(default false)
|
(default "if_stats_list")
|
||||||
|
|
||||||
|
* fip_stats_list:
|
||||||
|
Traffic on floating ips
|
||||||
|
* if_stats_list:
|
||||||
|
Traffic on VM interfaces
|
||||||
|
|
||||||
e.g.::
|
e.g.::
|
||||||
|
|
||||||
opencontrail://localhost:8143/?username=admin&password=admin&
|
opencontrail://localhost:8081/?resource=fip_stats_list&
|
||||||
scheme=https&domain=&verify_ssl=true
|
virtual_network=default-domain:openstack:public
|
||||||
"""
|
"""
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _prepare_cache(endpoint, params, cache):
|
def _prepare_cache(endpoint, params, cache):
|
||||||
@ -58,11 +67,7 @@ class OpencontrailDriver(driver.Driver):
|
|||||||
return cache['network.statistics.opencontrail']
|
return cache['network.statistics.opencontrail']
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
'o_client': client.Client(endpoint,
|
'o_client': client.Client(endpoint),
|
||||||
params['username'],
|
|
||||||
params['password'],
|
|
||||||
params.get('domain'),
|
|
||||||
params.get('verify_ssl') == 'true'),
|
|
||||||
'n_client': neutron_client.Client()
|
'n_client': neutron_client.Client()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -95,22 +100,21 @@ class OpencontrailDriver(driver.Driver):
|
|||||||
data = self._prepare_cache(endpoint, params, cache)
|
data = self._prepare_cache(endpoint, params, cache)
|
||||||
|
|
||||||
ports = data['n_client'].port_get_all()
|
ports = data['n_client'].port_get_all()
|
||||||
ports_map = dict((port['id'], port['tenant_id']) for port in ports)
|
ports_map = dict((port['id'], port) for port in ports)
|
||||||
|
|
||||||
networks = data['n_client'].network_get_all()
|
resource = params.get('resource', ['if_stats_list'])[0]
|
||||||
|
fqdn_uuid = params.get('fqdn_uuid', ['*'])[0]
|
||||||
for network in networks:
|
virtual_network = params.get('virtual_network', [None])[0]
|
||||||
net_id = network['id']
|
|
||||||
|
|
||||||
timestamp = timeutils.utcnow().isoformat()
|
timestamp = timeutils.utcnow().isoformat()
|
||||||
statistics = data['o_client'].networks.get_port_statistics(net_id)
|
statistics = data['o_client'].networks.get_vm_statistics(fqdn_uuid)
|
||||||
if not statistics:
|
if not statistics:
|
||||||
continue
|
return
|
||||||
|
|
||||||
for value in statistics['value']:
|
for value in statistics['value']:
|
||||||
for sample in iter(extractor, value, ports_map):
|
for sample in iter(extractor, value, ports_map,
|
||||||
|
resource, virtual_network):
|
||||||
if sample is not None:
|
if sample is not None:
|
||||||
sample[2]['network_id'] = net_id
|
|
||||||
yield sample + (timestamp, )
|
yield sample + (timestamp, )
|
||||||
|
|
||||||
def _get_iter(self, meter_name):
|
def _get_iter(self, meter_name):
|
||||||
@ -122,17 +126,65 @@ class OpencontrailDriver(driver.Driver):
|
|||||||
return getattr(self, method_name, None)
|
return getattr(self, method_name, None)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _iter_port(extractor, value, ports_map):
|
def _explode_name(fq_name):
|
||||||
ifstats = value['value']['UveVirtualMachineAgent']['if_stats_list']
|
m = re.match(
|
||||||
for ifstat in ifstats:
|
"(?P<domain>[^:]+):(?P<project>.+):(?P<port_id>[^:]+)",
|
||||||
name = ifstat['name']
|
fq_name)
|
||||||
device_owner_id, port_id = name.split(':')
|
if not m:
|
||||||
|
return
|
||||||
|
return m.group('domain'), m.group('project'), m.group('port_id')
|
||||||
|
|
||||||
tenant_id = ports_map.get(port_id)
|
@staticmethod
|
||||||
|
def _get_resource_meta(ports_map, stat, resource, network):
|
||||||
|
if resource == 'fip_stats_list':
|
||||||
|
if network and (network != stat['virtual_network']):
|
||||||
|
return
|
||||||
|
name = stat['iface_name']
|
||||||
|
else:
|
||||||
|
name = stat['name']
|
||||||
|
|
||||||
|
domain, project, port_id = OpencontrailDriver._explode_name(name)
|
||||||
|
port = ports_map.get(port_id)
|
||||||
|
|
||||||
|
tenant_id = None
|
||||||
|
network_id = None
|
||||||
|
device_owner_id = None
|
||||||
|
|
||||||
|
if port:
|
||||||
|
tenant_id = port['tenant_id']
|
||||||
|
network_id = port['network_id']
|
||||||
|
device_owner_id = port['device_id']
|
||||||
|
|
||||||
resource_meta = {'device_owner_id': device_owner_id,
|
resource_meta = {'device_owner_id': device_owner_id,
|
||||||
'tenant_id': tenant_id}
|
'network_id': network_id,
|
||||||
yield extractor(ifstat, port_id, resource_meta)
|
'project_id': tenant_id,
|
||||||
|
'project': project,
|
||||||
|
'resource': resource,
|
||||||
|
'domain': domain}
|
||||||
|
|
||||||
|
return port_id, resource_meta
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _iter_port(extractor, value, ports_map, resource,
|
||||||
|
virtual_network=None):
|
||||||
|
stats = value['value']['UveVirtualMachineAgent'].get(resource, [])
|
||||||
|
for stat in stats:
|
||||||
|
if type(stat) is list:
|
||||||
|
for sub_stats, node in zip(*[iter(stat)] * 2):
|
||||||
|
for sub_stat in sub_stats:
|
||||||
|
result = OpencontrailDriver._get_resource_meta(
|
||||||
|
ports_map, sub_stat, resource, virtual_network)
|
||||||
|
if not result:
|
||||||
|
continue
|
||||||
|
port_id, resource_meta = result
|
||||||
|
yield extractor(sub_stat, port_id, resource_meta)
|
||||||
|
else:
|
||||||
|
result = OpencontrailDriver._get_resource_meta(
|
||||||
|
ports_map, stat, resource, virtual_network)
|
||||||
|
if not result:
|
||||||
|
continue
|
||||||
|
port_id, resource_meta = result
|
||||||
|
yield extractor(stat, port_id, resource_meta)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _switch_port_receive_packets(statistic, resource_id, resource_meta):
|
def _switch_port_receive_packets(statistic, resource_id, resource_meta):
|
||||||
|
@ -24,53 +24,44 @@ class TestOpencontrailClient(base.BaseTestCase):
|
|||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestOpencontrailClient, self).setUp()
|
super(TestOpencontrailClient, self).setUp()
|
||||||
self.client = client.Client('http://127.0.0.1:8143',
|
self.client = client.Client('http://127.0.0.1:8081', {'arg1': 'aaa'})
|
||||||
'admin', 'admin', None, False)
|
|
||||||
|
|
||||||
self.post_resp = mock.MagicMock()
|
|
||||||
self.post = mock.patch('requests.post',
|
|
||||||
return_value=self.post_resp).start()
|
|
||||||
|
|
||||||
self.post_resp.raw.version = 1.1
|
|
||||||
self.post_resp.status_code = 302
|
|
||||||
self.post_resp.reason = 'Moved'
|
|
||||||
self.post_resp.headers = {}
|
|
||||||
self.post_resp.cookies = {'connect.sid': 'aaa'}
|
|
||||||
self.post_resp.content = 'dummy'
|
|
||||||
|
|
||||||
self.get_resp = mock.MagicMock()
|
self.get_resp = mock.MagicMock()
|
||||||
self.get = mock.patch('requests.get',
|
self.get = mock.patch('requests.get',
|
||||||
return_value=self.get_resp).start()
|
return_value=self.get_resp).start()
|
||||||
self.get_resp.raw_version = 1.1
|
self.get_resp.raw_version = 1.1
|
||||||
self.get_resp.status_code = 200
|
self.get_resp.status_code = 200
|
||||||
self.post_resp.content = 'dqs'
|
|
||||||
|
|
||||||
def test_port_statistics(self):
|
def test_vm_statistics(self):
|
||||||
uuid = 'bbb'
|
self.client.networks.get_vm_statistics('bbb')
|
||||||
self.client.networks.get_port_statistics(uuid)
|
|
||||||
|
|
||||||
call_args = self.post.call_args_list[0][0]
|
|
||||||
call_kwargs = self.post.call_args_list[0][1]
|
|
||||||
|
|
||||||
expected_url = 'http://127.0.0.1:8143/authenticate'
|
|
||||||
self.assertEqual(expected_url, call_args[0])
|
|
||||||
|
|
||||||
data = call_kwargs.get('data')
|
|
||||||
expected_data = {'domain': None, 'password': 'admin',
|
|
||||||
'username': 'admin'}
|
|
||||||
self.assertEqual(expected_data, data)
|
|
||||||
|
|
||||||
call_args = self.get.call_args_list[0][0]
|
call_args = self.get.call_args_list[0][0]
|
||||||
call_kwargs = self.get.call_args_list[0][1]
|
call_kwargs = self.get.call_args_list[0][1]
|
||||||
|
|
||||||
expected_url = ('http://127.0.0.1:8143/api/tenant/'
|
expected_url = ('http://127.0.0.1:8081/analytics/'
|
||||||
'networking/virtual-machines/details')
|
'uves/virtual-machine/bbb')
|
||||||
self.assertEqual(expected_url, call_args[0])
|
self.assertEqual(expected_url, call_args[0])
|
||||||
|
|
||||||
data = call_kwargs.get('data')
|
data = call_kwargs.get('data')
|
||||||
cookies = call_kwargs.get('cookies')
|
|
||||||
|
|
||||||
expected_data = {'fqnUUID': 'bbb', 'type': 'vn'}
|
expected_data = {'arg1': 'aaa'}
|
||||||
expected_cookies = {'connect.sid': 'aaa'}
|
self.assertEqual(expected_data, data)
|
||||||
|
|
||||||
|
def test_vm_statistics_params(self):
|
||||||
|
self.client.networks.get_vm_statistics('bbb',
|
||||||
|
{'resource': 'fip_stats_list',
|
||||||
|
'virtual_network': 'ccc'})
|
||||||
|
|
||||||
|
call_args = self.get.call_args_list[0][0]
|
||||||
|
call_kwargs = self.get.call_args_list[0][1]
|
||||||
|
|
||||||
|
expected_url = ('http://127.0.0.1:8081/analytics/'
|
||||||
|
'uves/virtual-machine/bbb')
|
||||||
|
self.assertEqual(expected_url, call_args[0])
|
||||||
|
|
||||||
|
data = call_kwargs.get('data')
|
||||||
|
|
||||||
|
expected_data = {'arg1': 'aaa',
|
||||||
|
'resource': 'fip_stats_list',
|
||||||
|
'virtual_network': 'ccc'}
|
||||||
self.assertEqual(expected_data, data)
|
self.assertEqual(expected_data, data)
|
||||||
self.assertEqual(expected_cookies, cookies)
|
|
||||||
|
@ -31,11 +31,6 @@ class TestOpencontrailDriver(base.BaseTestCase):
|
|||||||
return_value=self.fake_ports())
|
return_value=self.fake_ports())
|
||||||
self.nc_ports.start()
|
self.nc_ports.start()
|
||||||
|
|
||||||
self.nc_networks = mock.patch('ceilometer.neutron_client'
|
|
||||||
'.Client.network_get_all',
|
|
||||||
return_value=self.fake_networks())
|
|
||||||
self.nc_networks.start()
|
|
||||||
|
|
||||||
self.driver = driver.OpencontrailDriver()
|
self.driver = driver.OpencontrailDriver()
|
||||||
self.parse_url = urlparse.ParseResult('opencontrail',
|
self.parse_url = urlparse.ParseResult('opencontrail',
|
||||||
'127.0.0.1:8143',
|
'127.0.0.1:8143',
|
||||||
@ -43,7 +38,8 @@ class TestOpencontrailDriver(base.BaseTestCase):
|
|||||||
self.params = {'password': ['admin'],
|
self.params = {'password': ['admin'],
|
||||||
'scheme': ['http'],
|
'scheme': ['http'],
|
||||||
'username': ['admin'],
|
'username': ['admin'],
|
||||||
'verify_ssl': ['false']}
|
'verify_ssl': ['false'],
|
||||||
|
'resource': ['if_stats_list']}
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def fake_ports():
|
def fake_ports():
|
||||||
@ -58,20 +54,6 @@ class TestOpencontrailDriver(base.BaseTestCase):
|
|||||||
'status': 'ACTIVE',
|
'status': 'ACTIVE',
|
||||||
'tenant_id': '89271fa581ab4380bf172f868c3615f9'}]
|
'tenant_id': '89271fa581ab4380bf172f868c3615f9'}]
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def fake_networks():
|
|
||||||
return [{'admin_state_up': True,
|
|
||||||
'id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
|
||||||
'name': 'public',
|
|
||||||
'provider:network_type': 'gre',
|
|
||||||
'provider:physical_network': None,
|
|
||||||
'provider:segmentation_id': 2,
|
|
||||||
'router:external': True,
|
|
||||||
'shared': False,
|
|
||||||
'status': 'ACTIVE',
|
|
||||||
'subnets': [u'c4b6f5b8-3508-4896-b238-a441f25fb492'],
|
|
||||||
'tenant_id': '62d6f08bbd3a44f6ad6f00ca15cce4e5'}]
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def fake_port_stats():
|
def fake_port_stats():
|
||||||
return {"value": [{
|
return {"value": [{
|
||||||
@ -85,61 +67,200 @@ class TestOpencontrailDriver(base.BaseTestCase):
|
|||||||
"out_bandwidth_usage": 0,
|
"out_bandwidth_usage": 0,
|
||||||
"out_pkts": 5,
|
"out_pkts": 5,
|
||||||
"in_pkts": 6,
|
"in_pkts": 6,
|
||||||
"name": ("674e553b-8df9-4321-87d9-93ba05b93558:"
|
"name": ("default-domain:demo:"
|
||||||
"96d49cc3-4e01-40ce-9cac-c0e32642a442")
|
"96d49cc3-4e01-40ce-9cac-c0e32642a442")
|
||||||
}]}}}]}
|
}],
|
||||||
|
"fip_stats_list": [{
|
||||||
|
"in_bytes": 33,
|
||||||
|
"iface_name": ("default-domain:demo:"
|
||||||
|
"96d49cc3-4e01-40ce-9cac-c0e32642a442"),
|
||||||
|
"out_bytes": 44,
|
||||||
|
"out_pkts": 10,
|
||||||
|
"virtual_network": "default-domain:openstack:public",
|
||||||
|
"in_pkts": 11,
|
||||||
|
"ip_address": "1.1.1.1"
|
||||||
|
}]
|
||||||
|
}}}]}
|
||||||
|
|
||||||
def _test_meter(self, meter_name, expected):
|
@staticmethod
|
||||||
|
def fake_port_stats_with_node():
|
||||||
|
return {"value": [{
|
||||||
|
"name": "c588ebb7-ae52-485a-9f0c-b2791c5da196",
|
||||||
|
"value": {
|
||||||
|
"UveVirtualMachineAgent": {
|
||||||
|
"if_stats_list": [
|
||||||
|
[[{
|
||||||
|
"out_bytes": 22,
|
||||||
|
"in_bandwidth_usage": 0,
|
||||||
|
"in_bytes": 23,
|
||||||
|
"out_bandwidth_usage": 0,
|
||||||
|
"out_pkts": 5,
|
||||||
|
"in_pkts": 6,
|
||||||
|
"name": ("default-domain:demo:"
|
||||||
|
"96d49cc3-4e01-40ce-9cac-c0e32642a442")
|
||||||
|
}], 'node1'],
|
||||||
|
[[{
|
||||||
|
"out_bytes": 22,
|
||||||
|
"in_bandwidth_usage": 0,
|
||||||
|
"in_bytes": 23,
|
||||||
|
"out_bandwidth_usage": 0,
|
||||||
|
"out_pkts": 4,
|
||||||
|
"in_pkts": 13,
|
||||||
|
"name": ("default-domain:demo:"
|
||||||
|
"96d49cc3-4e01-40ce-9cac-c0e32642a442")}],
|
||||||
|
'node2']
|
||||||
|
]
|
||||||
|
}}}]}
|
||||||
|
|
||||||
|
def _test_meter(self, meter_name, expected, fake_port_stats=None):
|
||||||
|
if not fake_port_stats:
|
||||||
|
fake_port_stats = self.fake_port_stats()
|
||||||
with mock.patch('ceilometer.network.'
|
with mock.patch('ceilometer.network.'
|
||||||
'statistics.opencontrail.'
|
'statistics.opencontrail.'
|
||||||
'client.NetworksAPIClient.'
|
'client.NetworksAPIClient.'
|
||||||
'get_port_statistics',
|
'get_vm_statistics',
|
||||||
return_value=self.fake_port_stats()) as port_stats:
|
return_value=fake_port_stats) as port_stats:
|
||||||
|
|
||||||
samples = self.driver.get_sample_data(meter_name, self.parse_url,
|
samples = self.driver.get_sample_data(meter_name, self.parse_url,
|
||||||
self.params, {})
|
self.params, {})
|
||||||
|
|
||||||
self.assertEqual(expected, [s for s in samples])
|
self.assertEqual(expected, [s for s in samples])
|
||||||
|
|
||||||
net_id = '298a3088-a446-4d5a-bad8-f92ecacd786b'
|
port_stats.assert_called_with('*')
|
||||||
port_stats.assert_called_with(net_id)
|
|
||||||
|
def test_switch_port_receive_packets_with_node(self):
|
||||||
|
expected = [(6,
|
||||||
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'if_stats_list'},
|
||||||
|
mock.ANY),
|
||||||
|
(13,
|
||||||
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'if_stats_list'},
|
||||||
|
mock.ANY)]
|
||||||
|
self._test_meter('switch.port.receive.packets', expected,
|
||||||
|
self.fake_port_stats_with_node())
|
||||||
|
|
||||||
def test_switch_port_receive_packets(self):
|
def test_switch_port_receive_packets(self):
|
||||||
expected = [
|
expected = [(6,
|
||||||
(6,
|
|
||||||
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
{'device_owner_id': '674e553b-8df9-4321-87d9-93ba05b93558',
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
'tenant_id': '89271fa581ab4380bf172f868c3615f9'},
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'if_stats_list'},
|
||||||
mock.ANY)]
|
mock.ANY)]
|
||||||
self._test_meter('switch.port.receive.packets', expected)
|
self._test_meter('switch.port.receive.packets', expected)
|
||||||
|
|
||||||
def test_switch_port_transmit_packets(self):
|
def test_switch_port_transmit_packets(self):
|
||||||
expected = [
|
expected = [(5,
|
||||||
(5,
|
|
||||||
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
{'device_owner_id': '674e553b-8df9-4321-87d9-93ba05b93558',
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
'tenant_id': '89271fa581ab4380bf172f868c3615f9'},
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'if_stats_list'},
|
||||||
mock.ANY)]
|
mock.ANY)]
|
||||||
self._test_meter('switch.port.transmit.packets', expected)
|
self._test_meter('switch.port.transmit.packets', expected)
|
||||||
|
|
||||||
def test_switch_port_receive_bytes(self):
|
def test_switch_port_receive_bytes(self):
|
||||||
expected = [
|
expected = [(23,
|
||||||
(23,
|
|
||||||
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
{'device_owner_id': '674e553b-8df9-4321-87d9-93ba05b93558',
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
'tenant_id': '89271fa581ab4380bf172f868c3615f9'},
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'if_stats_list'},
|
||||||
mock.ANY)]
|
mock.ANY)]
|
||||||
self._test_meter('switch.port.receive.bytes', expected)
|
self._test_meter('switch.port.receive.bytes', expected)
|
||||||
|
|
||||||
def test_switch_port_transmit_bytes(self):
|
def test_switch_port_transmit_bytes(self):
|
||||||
expected = [
|
expected = [(22,
|
||||||
(22,
|
|
||||||
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
{'device_owner_id': '674e553b-8df9-4321-87d9-93ba05b93558',
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
'tenant_id': '89271fa581ab4380bf172f868c3615f9'},
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'if_stats_list'},
|
||||||
mock.ANY)]
|
mock.ANY)]
|
||||||
self._test_meter('switch.port.transmit.bytes', expected)
|
self._test_meter('switch.port.transmit.bytes', expected)
|
||||||
|
|
||||||
|
def test_switch_port_receive_packets_fip(self):
|
||||||
|
self.params['resource'] = ['fip_stats_list']
|
||||||
|
expected = [(11,
|
||||||
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'fip_stats_list'},
|
||||||
|
mock.ANY)]
|
||||||
|
self._test_meter('switch.port.receive.packets', expected)
|
||||||
|
|
||||||
|
def test_switch_port_transmit_packets_fip(self):
|
||||||
|
self.params['resource'] = ['fip_stats_list']
|
||||||
|
expected = [(10,
|
||||||
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'fip_stats_list'},
|
||||||
|
mock.ANY)]
|
||||||
|
self._test_meter('switch.port.transmit.packets', expected)
|
||||||
|
|
||||||
|
def test_switch_port_receive_bytes_fip(self):
|
||||||
|
self.params['resource'] = ['fip_stats_list']
|
||||||
|
expected = [(33,
|
||||||
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'fip_stats_list'},
|
||||||
|
mock.ANY)]
|
||||||
|
self._test_meter('switch.port.receive.bytes', expected)
|
||||||
|
|
||||||
|
def test_switch_port_transmit_bytes_fip(self):
|
||||||
|
self.params['resource'] = ['fip_stats_list']
|
||||||
|
expected = [(44,
|
||||||
|
'96d49cc3-4e01-40ce-9cac-c0e32642a442',
|
||||||
|
{'device_owner_id':
|
||||||
|
'674e553b-8df9-4321-87d9-93ba05b93558',
|
||||||
|
'domain': 'default-domain',
|
||||||
|
'network_id': '298a3088-a446-4d5a-bad8-f92ecacd786b',
|
||||||
|
'project': 'demo',
|
||||||
|
'project_id': '89271fa581ab4380bf172f868c3615f9',
|
||||||
|
'resource': 'fip_stats_list'},
|
||||||
|
mock.ANY)]
|
||||||
|
self._test_meter('switch.port.transmit.bytes', expected)
|
||||||
|
|
||||||
|
def test_switch_port_transmit_bytes_non_existing_network(self):
|
||||||
|
self.params['virtual_network'] = ['aaa']
|
||||||
|
self.params['resource'] = ['fip_stats_list']
|
||||||
|
self._test_meter('switch.port.transmit.bytes', [])
|
||||||
|
Loading…
Reference in New Issue
Block a user