Attach port to amphora when adding member to shared pool

When adding member to shared pool of load balancer(in spite of this
load balancer has listeners or not), it should plug the member port
into the amphorae if it isn't already plugged.

Change-Id: Ibe4c05fcb8a416caf931e55ab2233220b80613cb
Closes-Bug: #1572342
This commit is contained in:
Lingxian Kong
2016-05-03 18:58:13 +12:00
parent 6c000c2069
commit 6f94a41e06
2 changed files with 5 additions and 16 deletions

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()