openstack
/
ovn-octavia-provider
Code Issues Proposed changes

Fix E741 pep8 errors 

E741 ambiguous variable name 'l'

Change 'l' to 'listener' in affected code.

Change-Id: Ifcef2ad4b40641766383431b0043be491ed20ecb
This commit is contained in:
Brian Haley 2020-05-11 17:25:41 -04:00
parent fd460cd0fa
commit bf68be1cca
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ovn_octavia_provider/driver.py
View File

@ -1438,9 +1438,9 @@ class OvnProviderHelper(object):
pool_listeners = self._get_pool_listeners(ovn_lb, pool_key) pool_listeners = self._get_pool_listeners(ovn_lb, pool_key)
listener_status = [] listener_status = []
for l in pool_listeners: for listener in pool_listeners:
listener_status.append( listener_status.append(
{constants.ID: l, {constants.ID: listener,
constants.PROVISIONING_STATUS: constants.ACTIVE}) constants.PROVISIONING_STATUS: constants.ACTIVE})
status[constants.LISTENERS] = listener_status status[constants.LISTENERS] = listener_status
except Exception: except Exception:
@ -1504,9 +1504,9 @@ class OvnProviderHelper(object):
constants.PROVISIONING_STATUS: constants.ACTIVE}]} constants.PROVISIONING_STATUS: constants.ACTIVE}]}
pool_listeners = self._get_pool_listeners(ovn_lb, pool_key) pool_listeners = self._get_pool_listeners(ovn_lb, pool_key)
listener_status = [] listener_status = []
for l in pool_listeners: for listener in pool_listeners:
listener_status.append( listener_status.append(
{constants.ID: l, {constants.ID: listener,
constants.PROVISIONING_STATUS: constants.ACTIVE}) constants.PROVISIONING_STATUS: constants.ACTIVE})
status[constants.LISTENERS] = listener_status status[constants.LISTENERS] = listener_status
except Exception: except Exception:
@ -1580,9 +1580,9 @@ class OvnProviderHelper(object):
constants.PROVISIONING_STATUS: constants.ACTIVE}]} constants.PROVISIONING_STATUS: constants.ACTIVE}]}
pool_listeners = self._get_pool_listeners(ovn_lb, pool_key) pool_listeners = self._get_pool_listeners(ovn_lb, pool_key)
listener_status = [] listener_status = []
for l in pool_listeners: for listener in pool_listeners:
listener_status.append( listener_status.append(
{constants.ID: l, {constants.ID: listener,
constants.PROVISIONING_STATUS: constants.ACTIVE}) constants.PROVISIONING_STATUS: constants.ACTIVE})
status[constants.LISTENERS] = listener_status status[constants.LISTENERS] = listener_status
except Exception: except Exception:
@ -1644,9 +1644,9 @@ class OvnProviderHelper(object):
pool_listeners = self._get_pool_listeners(ovn_lb, pool_key) pool_listeners = self._get_pool_listeners(ovn_lb, pool_key)
listener_status = [] listener_status = []
for l in pool_listeners: for listener in pool_listeners:
listener_status.append( listener_status.append(
{constants.ID: l, {constants.ID: listener,
constants.PROVISIONING_STATUS: constants.ACTIVE}) constants.PROVISIONING_STATUS: constants.ACTIVE})
status[constants.LISTENERS] = listener_status status[constants.LISTENERS] = listener_status
except Exception: except Exception:

50
ovn_octavia_provider/tests/functional/test_driver.py
View File

@ -453,8 +453,8 @@ class TestOvnOctaviaBase(
# Lets fetch list of L4 protocols defined for this LB. # Lets fetch list of L4 protocols defined for this LB.
for p in lb_data['pools']: for p in lb_data['pools']:
expected_protocols.add(p.protocol.lower()) expected_protocols.add(p.protocol.lower())
for l in lb_data['listeners']: for listener in lb_data['listeners']:
expected_protocols.add(l.protocol.lower()) expected_protocols.add(listener.protocol.lower())
# If there is no protocol lets add default - empty []. # If there is no protocol lets add default - empty [].
expected_protocols = list(expected_protocols) expected_protocols = list(expected_protocols)
if len(expected_protocols) == 0: if len(expected_protocols) == 0:
@ -524,28 +524,28 @@ class TestOvnOctaviaBase(
external_ids[pool_key] = p_members external_ids[pool_key] = p_members
pool_info[p.pool_id] = p_members pool_info[p.pool_id] = p_members
for l in lb_data['listeners']: for listener in lb_data['listeners']:
expected_vips = _get_lb_field_by_protocol( expected_vips = _get_lb_field_by_protocol(
l.protocol.lower(), listener.protocol.lower(),
field='vips') field='vips')
external_ids = _get_lb_field_by_protocol( external_ids = _get_lb_field_by_protocol(
l.protocol.lower(), listener.protocol.lower(),
field='external_ids') field='external_ids')
listener_k = 'listener_' + str(l.listener_id) listener_k = 'listener_' + str(listener.listener_id)
if lb_data['model'].admin_state_up and l.admin_state_up: if lb_data['model'].admin_state_up and listener.admin_state_up:
vip_k = lb_data['model'].vip_address + ":" + str( vip_k = lb_data['model'].vip_address + ":" + str(
l.protocol_port) listener.protocol_port)
if not isinstance(l.default_pool_id, if not isinstance(listener.default_pool_id,
octavia_data_model.UnsetType) and pool_info[ octavia_data_model.UnsetType) and pool_info[
l.default_pool_id]: listener.default_pool_id]:
expected_vips[vip_k] = self._extract_member_info( expected_vips[vip_k] = self._extract_member_info(
pool_info[l.default_pool_id]) pool_info[listener.default_pool_id])
else: else:
listener_k += ':D' listener_k += ':D'
external_ids[listener_k] = str(l.protocol_port) + ":" external_ids[listener_k] = str(listener.protocol_port) + ":"
if not isinstance(l.default_pool_id, if not isinstance(listener.default_pool_id,
octavia_data_model.UnsetType): octavia_data_model.UnsetType):
external_ids[listener_k] += 'pool_' + (l.default_pool_id) external_ids[listener_k] += 'pool_' + listener.default_pool_id
elif lb_data.get('pools', []): elif lb_data.get('pools', []):
external_ids[listener_k] += 'pool_' + lb_data[ external_ids[listener_k] += 'pool_' + lb_data[
'pools'][0].pool_id 'pools'][0].pool_id
@ -599,8 +599,8 @@ class TestOvnOctaviaBase(
pool_listeners = self._get_pool_listeners(lb_data, m_pool.pool_id) pool_listeners = self._get_pool_listeners(lb_data, m_pool.pool_id)
expected_listener_status = [ expected_listener_status = [
{'id': l.listener_id, 'provisioning_status': 'ACTIVE'} {'id': listener.listener_id, 'provisioning_status': 'ACTIVE'}
for l in pool_listeners] for listener in pool_listeners]
self.ovn_driver.pool_update(m_pool, m_pool) self.ovn_driver.pool_update(m_pool, m_pool)
expected_status = { expected_status = {
'pools': [{'id': m_pool.pool_id, 'pools': [{'id': m_pool.pool_id,
@ -667,16 +667,16 @@ class TestOvnOctaviaBase(
return p return p
def _get_listener_from_lb_data(self, lb_data, protocol, protocol_port): def _get_listener_from_lb_data(self, lb_data, protocol, protocol_port):
for l in lb_data['listeners']: for listener in lb_data['listeners']:
if (l.protocol_port == protocol_port and if (listener.protocol_port == protocol_port and
l.protocol == protocol): listener.protocol == protocol):
return l return listener
def _get_pool_listeners(self, lb_data, pool_id): def _get_pool_listeners(self, lb_data, pool_id):
listeners = [] listeners = []
for l in lb_data['listeners']: for listener in lb_data['listeners']:
if l.default_pool_id == pool_id: if listener.default_pool_id == pool_id:
listeners.append(l) listeners.append(listener)
return listeners return listeners
@ -695,8 +695,8 @@ class TestOvnOctaviaBase(
self._update_ls_refs(lb_data, network_id) self._update_ls_refs(lb_data, network_id)
pool_listeners = self._get_pool_listeners(lb_data, pool_id) pool_listeners = self._get_pool_listeners(lb_data, pool_id)
expected_listener_status = [ expected_listener_status = [
{'id': l.listener_id, 'provisioning_status': 'ACTIVE'} {'id': listener.listener_id, 'provisioning_status': 'ACTIVE'}
for l in pool_listeners] for listener in pool_listeners]
expected_status = { expected_status = {
'pools': [pool_status], 'pools': [pool_status],