openstack/octavia
Code Issues Proposed changes

Merge "Attach port to amphora when adding member to shared pool"

Browse Source
This commit is contained in:
Jenkins 2016-05-27 22:43:27 +00:00 committed by Gerrit Code Review
commit d532e920ec
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
octavia/controller/worker/tasks/network_tasks.py
View File

@ -60,16 +60,10 @@ class CalculateAmphoraDelta(BaseNetworkTask):
if CONF.controller_worker.amp_network:
desired_network_ids.add(CONF.controller_worker.amp_network)
if not loadbalancer.listeners:
return None
for listener in loadbalancer.listeners:
if (not listener.default_pool) or (
not listener.default_pool.members):
continue
for pool in loadbalancer.pools:
member_networks = [
self.network_driver.get_subnet(member.subnet_id).network_id
for member in listener.default_pool.members
for member in pool.members
if member.subnet_id
]
desired_network_ids.update(member_networks)

11
octavia/tests/unit/controller/worker/tasks/test_network_tasks.py
View File

@ -87,19 +87,14 @@ class TestNetworkTasks(base.TestCase):
self.amphora_mock.load_balancer = self.load_balancer_mock
self.load_balancer_mock.amphorae = [self.amphora_mock]
self.load_balancer_mock.listeners = None
self.assertEqual({self.amphora_mock.id: None},
net.execute(self.load_balancer_mock))
self.load_balancer_mock.pools = []
listener_mock = mock.MagicMock()
self.load_balancer_mock.listeners = [listener_mock]
listener_mock.default_pool = None
self.assertEqual(empty_deltas, net.execute(self.load_balancer_mock))
mock_driver.get_plugged_networks.assert_called_once_with(COMPUTE_ID)
pool_mock = mock.MagicMock()
listener_mock.default_pool = pool_mock
pool_mock.members = None
self.load_balancer_mock.pools = [pool_mock]
pool_mock.members = []
self.assertEqual(empty_deltas, net.execute(self.load_balancer_mock))
member_mock = mock.MagicMock()