openstack
/
neutron-lbaas
Code Issues Proposed changes

Fix test assumptions about IP allocation 

Several tests in the neutron-lbaas code tree make assumptions about how
IP addresses in Neutron subnets will be allocated without actually
specifying the IP addresses explictly. Neutron's behavior recently
changed on this front, and these tests started failing in the gate. This
commit updates these tests to explicitly specify the IP address they
should be testing against for allocation purposes, or to dynamically
detect the IP address Neutron has assigned during a previous call.

Change-Id: I0afc3acfff96f85622495364240e1e60f9fd5d7c
Closes-Bug: #1591380
This commit is contained in:
Stephen Balukoff 2016-06-10 15:24:58 -07:00
parent fcf3289a66
commit 41ec2ff5e3
2 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancer.py
View File

@ -559,7 +559,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase):
('admin_state_up', False),
('status', 'PENDING_UPDATE')]
with self.vip(name=name) as vip:
with self.vip(name=name, address='10.0.0.2') as vip:
keys.append(('subnet_id', vip['vip']['subnet_id']))
data = {'vip': {'name': name,
'connection_limit': 100,
@ -605,7 +605,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase):
('connection_limit', -1),
('admin_state_up', True),
('status', 'PENDING_CREATE')]
with self.vip(name=name) as vip:
with self.vip(name=name, address='10.0.0.2') as vip:
keys.append(('subnet_id', vip['vip']['subnet_id']))
req = self.new_list_request('vips')
res = self.deserialize(self.fmt, req.get_response(self.ext_api))

58
neutron_lbaas/tests/unit/drivers/radware/test_v2_plugin_driver.py
View File

@ -525,7 +525,10 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
def test_wf_created_on_first_member_creation(self):
with self.subnet(cidr='10.0.0.0/24') as vip_sub:
with self.loadbalancer(subnet=vip_sub) as lb:
with self.loadbalancer(
subnet=vip_sub,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address']
) as lb:
lb_id = lb['loadbalancer']['id']
with self.listener(loadbalancer_id=lb_id) as l:
listener_id = l['listener']['id']
@ -543,7 +546,10 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
def test_wf_deleted_on_lb_deletion(self):
with self.subnet(cidr='10.0.0.0/24') as vip_sub:
with self.loadbalancer(subnet=vip_sub) as lb:
with self.loadbalancer(
subnet=vip_sub,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address']
) as lb:
get_calls = [
mock.call('GET', u'/api/workflow/LB_' +
lb['loadbalancer']['id'], None, None)]
@ -570,7 +576,10 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
def test_lb_crud(self):
with self.subnet(cidr='10.0.0.0/24') as s:
with self.loadbalancer(subnet=s, no_delete=True) as lb:
with self.loadbalancer(
subnet=s,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address'],
no_delete=True) as lb:
lb_id = lb['loadbalancer']['id']
with self.listener(loadbalancer_id=lb_id) as l:
with self.pool(
@ -641,7 +650,10 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
def test_member_crud(self):
with self.subnet(cidr='10.0.0.0/24') as s:
with self.loadbalancer(subnet=s) as lb:
with self.loadbalancer(
subnet=s,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address']
) as lb:
lb_id = lb['loadbalancer']['id']
with self.listener(loadbalancer_id=lb_id) as l:
listener_id = l['listener']['id']
@ -694,7 +706,10 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
def test_build_objects_with_tls(self):
with self.subnet(cidr='10.0.0.0/24') as vip_sub:
with self.loadbalancer(subnet=vip_sub) as lb:
with self.loadbalancer(
subnet=vip_sub,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address']
) as lb:
lb_id = lb['loadbalancer']['id']
with nested(
mock.patch('neutron_lbaas.services.loadbalancer.plugin.'
@ -727,7 +742,10 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
def test_build_objects_with_l7(self):
with self.subnet(cidr='10.0.0.0/24') as vip_sub:
with self.loadbalancer(subnet=vip_sub) as lb:
with self.loadbalancer(
subnet=vip_sub,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address']
) as lb:
lb_id = lb['loadbalancer']['id']
with self.listener(
protocol=lb_con.PROTOCOL_HTTP,
@ -776,7 +794,10 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
def test_build_objects_graph_lb_pool(self):
with self.subnet(cidr='10.0.0.0/24') as vip_sub:
with self.loadbalancer(subnet=vip_sub) as lb:
with self.loadbalancer(
subnet=vip_sub,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address']
) as lb:
lb_id = lb['loadbalancer']['id']
with self.listener(loadbalancer_id=lb_id) as listener:
listener_id = listener['listener']['id']
@ -800,7 +821,10 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
def test_build_objects_graph_one_leg(self):
with self.subnet(cidr='10.0.0.0/24') as vip_sub:
with self.loadbalancer(subnet=vip_sub) as lb:
with self.loadbalancer(
subnet=vip_sub,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address']
) as lb:
lb_id = lb['loadbalancer']['id']
with self.listener(loadbalancer_id=lb_id) as listener:
listener_id = listener['listener']['id']
@ -820,7 +844,10 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
self.subnet(cidr='20.0.0.0/24'),
self.subnet(cidr='30.0.0.0/24')
) as (vip_sub, member_sub1, member_sub2):
with self.loadbalancer(subnet=vip_sub) as lb:
with self.loadbalancer(
subnet=vip_sub,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address']
) as lb:
lb_id = lb['loadbalancer']['id']
with self.listener(loadbalancer_id=lb_id) as listener:
with self.pool(
@ -844,10 +871,14 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
id=member['member']['id'],
address='20.0.1.10',
subnet='20.0.1.10', gw='20.0.0.1')
self.wf_apply_params['parameters'][
'pip_address'] = '20.0.0.2'
self.set_two_leg_mode(True)
self.add_network_to_service(member_sub1)
self.wf_apply_params['parameters'][
'pip_address'] =\
self.driver_rest_call_mock.mock_calls[
len(self.driver_rest_call_mock.
mock_calls) - 2][1][2][
'parameters']['pip_address']
self.compare_create_call()
self.compare_apply_call()
@ -895,7 +926,10 @@ class TestLBaaSDriverDebugOptions(TestLBaaSDriverBase):
def test_debug_options(self):
with self.subnet(cidr='10.0.0.0/24') as s:
with self.loadbalancer(subnet=s) as lb:
with self.loadbalancer(
subnet=s,
vip_address=WF_APPLY_PARAMS['parameters']['vip_address']
) as lb:
lb_id = lb['loadbalancer']['id']
with self.listener(loadbalancer_id=lb_id) as l:
with self.pool(