openstack/octavia
Code Issues Proposed changes

Merge "Don't update the management port when calculating delta [v1]" into stable/zed

Browse Source
This commit is contained in:
Zuul 2024-04-25 23:54:52 +00:00 committed by Gerrit Code Review
commit d593976c33
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
octavia/controller/worker/v1/tasks/network_tasks.py
View File

@ -56,11 +56,6 @@ class CalculateAmphoraDelta(BaseNetworkTask):
def execute(self, loadbalancer, amphora, availability_zone):
LOG.debug("Calculating network delta for amphora id: %s", amphora.id)
vip_subnet_to_net_map = {
loadbalancer.vip.subnet_id:
loadbalancer.vip.network_id,
}
# Figure out what networks we want
# seed with lb network(s)
if (availability_zone and
@ -75,12 +70,10 @@ class CalculateAmphoraDelta(BaseNetworkTask):
loadbalancer = self.lb_repo.get(
db_apis.get_session(), id=loadbalancer.id)
desired_subnet_to_net_map = {}
for mgmt_net_id in management_nets:
for subnet_id in self.network_driver.get_network(
mgmt_net_id).subnets:
desired_subnet_to_net_map[subnet_id] = mgmt_net_id
desired_subnet_to_net_map.update(vip_subnet_to_net_map)
desired_subnet_to_net_map = {
loadbalancer.vip.subnet_id:
loadbalancer.vip.network_id,
}
for pool in loadbalancer.pools:
for member in pool.members:
@ -99,7 +92,12 @@ class CalculateAmphoraDelta(BaseNetworkTask):
nics = self.network_driver.get_plugged_networks(
amphora.compute_id)
# we don't have two nics in the same network
network_to_nic_map = {nic.network_id: nic for nic in nics}
# Don't include the nics connected to the management network, we don't
# want to update these interfaces.
network_to_nic_map = {
nic.network_id: nic
for nic in nics
if nic.network_id not in management_nets}
plugged_network_ids = set(network_to_nic_map)

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

@ -162,7 +162,6 @@ class TestNetworkTasks(base.TestCase):
mock_lb_repo_get.return_value = lb_mock
mock_driver.get_port.return_value = vrrp_port
mock_driver.get_subnet.return_value = member_subnet
mock_driver.get_network.return_value = mgmt_net
mock_driver.get_plugged_networks.return_value = [
mgmt_interface,
vrrp_interface,
@ -200,9 +199,6 @@ class TestNetworkTasks(base.TestCase):
mgmt_subnet = data_models.Subnet(
id=self.mgmt_subnet_id, network_id=self.mgmt_net_id)
mgmt_net = data_models.Network(
id=self.mgmt_net_id,
subnets=[mgmt_subnet.id])
mgmt_ip_address = mock.MagicMock()
mgmt_interface = data_models.Interface(
network_id=self.mgmt_net_id,
@ -273,7 +269,6 @@ class TestNetworkTasks(base.TestCase):
fixed_ips=vrrp_port.fixed_ips)]
mock_driver.get_port.return_value = vrrp_port
mock_driver.get_subnet.return_value = vrrp_subnet
mock_driver.get_network.return_value = mgmt_net
calc_delta = network_tasks.CalculateDelta()
@ -376,10 +371,6 @@ class TestNetworkTasks(base.TestCase):
mgmt2_subnet = data_models.Subnet(
id=mgmt2_subnet_id,
network_id=mgmt2_net_id)
mgmt2_net = data_models.Network(
id=mgmt2_net_id,
subnets=[mgmt2_subnet.id]
)
mgmt2_interface = data_models.Interface(
network_id=mgmt2_net_id,
fixed_ips=[
@ -388,7 +379,6 @@ class TestNetworkTasks(base.TestCase):
subnet_id=mgmt2_subnet_id,
)
])
mock_driver.get_network.return_value = mgmt2_net
az = {
constants.MANAGEMENT_NETWORK: mgmt2_net_id,
}
@ -408,7 +398,6 @@ class TestNetworkTasks(base.TestCase):
# Test with one amp and one pool and one member, wrong network plugged
# Delta should be one network/subnet to add and one to remove
mock_driver.reset_mock()
mock_driver.get_network.return_value = mgmt_net
member_mock = mock.MagicMock()
member_mock.subnet_id = member_private_subnet.id
pool_mock.members = [member_mock]