Remove useless proto parameter from sample functions

Some functions in unit tests are creating namedtuples that represent
loadbalancers, these sample loadbalancer objects contain a 'protocol'
field that doesn't exist in real objects and isn't used.

Change-Id: I8f191a720a3d38a7f579ed5f587563bfd40cce15
This commit is contained in:
Gregory Thiemonge 2020-10-28 11:02:29 +01:00
parent 58bf439bda
commit 9653920a04
1 changed files with 5 additions and 9 deletions

View File

@ -495,20 +495,18 @@ RET_UDP_LISTENER = {
def sample_listener_loadbalancer_tuple(
proto=None, topology=None, enabled=True, pools=None):
proto = 'HTTP' if proto is None else proto
topology=None, enabled=True, pools=None):
if topology and topology in ['ACTIVE_STANDBY', 'ACTIVE_ACTIVE']:
more_amp = True
else:
more_amp = False
topology = constants.TOPOLOGY_SINGLE
in_lb = collections.namedtuple(
'load_balancer', 'id, name, protocol, vip, amphorae, topology, '
'load_balancer', 'id, name, vip, amphorae, topology, '
'pools, listeners, enabled, project_id')
return in_lb(
id='sample_loadbalancer_id_1',
name='test-lb',
protocol=proto,
vip=sample_vip_tuple(),
amphorae=[sample_amphora_tuple(role=constants.ROLE_MASTER),
sample_amphora_tuple(
@ -526,8 +524,7 @@ def sample_listener_loadbalancer_tuple(
def sample_lb_with_udp_listener_tuple(
proto=None, topology=None, enabled=True, pools=None):
proto = 'HTTP' if proto is None else proto
topology=None, enabled=True, pools=None):
if topology and topology in ['ACTIVE_STANDBY', 'ACTIVE_ACTIVE']:
more_amp = True
else:
@ -541,12 +538,11 @@ def sample_lb_with_udp_listener_tuple(
monitor_proto=constants.HEALTH_MONITOR_UDP_CONNECT)]
in_lb = collections.namedtuple(
'load_balancer', 'id, name, protocol, vip, amphorae, topology, '
'load_balancer', 'id, name, vip, amphorae, topology, '
'pools, enabled, project_id, listeners')
return in_lb(
id='sample_loadbalancer_id_1',
name='test-lb',
protocol=proto,
vip=sample_vip_tuple(),
amphorae=[sample_amphora_tuple(role=constants.ROLE_MASTER),
sample_amphora_tuple(
@ -690,7 +686,7 @@ def sample_listener_tuple(proto=None, monitor=True, alloc_default_pool=True,
protocol_port=port,
protocol=proto,
load_balancer=sample_listener_loadbalancer_tuple(
proto=proto, topology=topology, pools=pools),
topology=topology, pools=pools),
peer_port=peer_port,
default_pool=sample_pool_tuple(
listener_id='sample_listener_id_1',