openstack/ceilometer
Code Issues Proposed changes

Check lbaas version if call is v2 specific

Browse Source 
lbaas/loadbalancers and lbaas/listeners are not supported in v1 lbaas
extension [1]

1. http://developer.openstack.org/api-ref-networking-v2-ext.html#lbaas-v1.0

Change-Id: I09dd0b5d98794ee773e010382f59fedb04123ff7
Closes-Bug: #1599482
This commit is contained in:
Laszlo Hegedus 2016-07-07 15:00:28 +02:00
parent 432f411603
commit 46e0d65f54
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/neutron_client.py
View File

@ -392,6 +392,9 @@ class Client(object):
@logged @logged
def list_listener(self): def list_listener(self):
"""This method is used to get the list of the listeners.""" """This method is used to get the list of the listeners."""
resources = []
if self.lb_version == 'v2':
# list_listeners works only with lbaas v2 extension
resp = self.client.list_listeners() resp = self.client.list_listeners()
resources = resp.get('listeners') resources = resp.get('listeners')
for listener in resources: for listener in resources:
@ -403,6 +406,9 @@ class Client(object):
@logged @logged
def list_loadbalancer(self): def list_loadbalancer(self):
"""This method is used to get the list of the loadbalancers.""" """This method is used to get the list of the loadbalancers."""
resources = []
if self.lb_version == 'v2':
# list_loadbalancers works only with lbaas v2 extension
resp = self.client.list_loadbalancers() resp = self.client.list_loadbalancers()
resources = resp.get('loadbalancers') resources = resp.get('loadbalancers')
return resources return resources

6
ceilometer/tests/unit/test_neutronclient.py
View File

@ -184,3 +184,9 @@ class TestNeutronClient(base.BaseTestCase):
self.assertEqual(2, stats[0]['total_connections']) self.assertEqual(2, stats[0]['total_connections'])
self.assertEqual(3, stats[0]['bytes_in']) self.assertEqual(3, stats[0]['bytes_in'])
self.assertEqual(4, stats[0]['bytes_out']) self.assertEqual(4, stats[0]['bytes_out'])
def test_v1_list_loadbalancer_returns_empty_list(self):
self.assertEqual([], self.nc.list_loadbalancer())
def test_v1_list_listener_returns_empty_list(self):
self.assertEqual([], self.nc.list_listener())