Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify forward/load-balancer OVN route add logic #533

Merged
merged 2 commits into from
Feb 24, 2024
Merged

Simplify forward/load-balancer OVN route add logic #533

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab4ddb6
incusd/network/ovn: Use ParseIPToNet instead of manual IPToNet and ne…
stgraber Feb 24, 2024
40d493d
incusd/network/ovn: Use listenAddressNet in family check
stgraber Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions internal/server/network/driver_ovn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4736,8 +4736,7 @@ func (n *ovn) ForwardCreate(forward api.NetworkForwardsPost, clientType request.
_ = n.forwardBGPSetupPrefixes()
})

vip := net.ParseIP(forward.Config["target_address"])
vips := n.forwardFlattenVIPs(net.ParseIP(forward.ListenAddress), vip, portMaps)
vips := n.forwardFlattenVIPs(net.ParseIP(forward.ListenAddress), net.ParseIP(forward.Config["target_address"]), portMaps)

err = ovnnb.LoadBalancerApply(n.getLoadBalancerName(forward.ListenAddress), []networkOVN.OVNRouter{n.getRouterName()}, []networkOVN.OVNSwitch{n.getIntSwitchName()}, vips...)
if err != nil {
Expand All @@ -4746,7 +4745,7 @@ func (n *ovn) ForwardCreate(forward api.NetworkForwardsPost, clientType request.

// Add internal static route to the network forward (helps with OVN IC).
var nexthop net.IP
if vip.To4() == nil {
if listenAddressNet.IP.To4() == nil {
routerV6, _, err := n.parseRouterIntPortIPv6Net()
if err == nil {
nexthop = routerV6
Expand All @@ -4759,12 +4758,12 @@ func (n *ovn) ForwardCreate(forward api.NetworkForwardsPost, clientType request.
}

if nexthop != nil {
err = ovnnb.LogicalRouterRouteAdd(n.getRouterName(), true, networkOVN.OVNRouterRoute{NextHop: nexthop, Prefix: IPToNet(vip)})
err = ovnnb.LogicalRouterRouteAdd(n.getRouterName(), true, networkOVN.OVNRouterRoute{NextHop: nexthop, Prefix: *listenAddressNet})
if err != nil {
return err
}

revert.Add(func() { _ = ovnnb.LogicalRouterRouteDelete(n.getRouterName(), IPToNet(vip)) })
revert.Add(func() { _ = ovnnb.LogicalRouterRouteDelete(n.getRouterName(), *listenAddressNet) })
}

// Notify all other members to refresh their BGP prefixes.
Expand Down Expand Up @@ -4926,8 +4925,12 @@ func (n *ovn) ForwardDelete(listenAddress string, clientType request.ClientType)
}

// Delete static route to network forward if present.
vip := IPToNet(net.ParseIP(forward.ListenAddress))
_ = ovnnb.LogicalRouterRouteDelete(n.getRouterName(), vip)
vip, err := ParseIPToNet(forward.ListenAddress)
if err != nil {
return err
}

_ = ovnnb.LogicalRouterRouteDelete(n.getRouterName(), *vip)

// Delete the database records.
err = n.state.DB.Cluster.Transaction(context.TODO(), func(ctx context.Context, tx *db.ClusterTx) error {
Expand Down Expand Up @@ -5116,8 +5119,7 @@ func (n *ovn) LoadBalancerCreate(loadBalancer api.NetworkLoadBalancersPost, clie
_ = n.loadBalancerBGPSetupPrefixes()
})

vip := net.ParseIP(loadBalancer.ListenAddress)
vips := n.loadBalancerFlattenVIPs(vip, portMaps)
vips := n.loadBalancerFlattenVIPs(net.ParseIP(loadBalancer.ListenAddress), portMaps)

err = ovnnb.LoadBalancerApply(n.getLoadBalancerName(loadBalancer.ListenAddress), []networkOVN.OVNRouter{n.getRouterName()}, []networkOVN.OVNSwitch{n.getIntSwitchName()}, vips...)
if err != nil {
Expand All @@ -5126,7 +5128,7 @@ func (n *ovn) LoadBalancerCreate(loadBalancer api.NetworkLoadBalancersPost, clie

// Add internal static route to the load-balancer (helps with OVN IC).
var nexthop net.IP
if vip.To4() == nil {
if listenAddressNet.IP.To4() == nil {
routerV6, _, err := n.parseRouterIntPortIPv6Net()
if err == nil {
nexthop = routerV6
Expand All @@ -5139,12 +5141,12 @@ func (n *ovn) LoadBalancerCreate(loadBalancer api.NetworkLoadBalancersPost, clie
}

if nexthop != nil {
err = ovnnb.LogicalRouterRouteAdd(n.getRouterName(), true, networkOVN.OVNRouterRoute{NextHop: nexthop, Prefix: IPToNet(vip)})
err = ovnnb.LogicalRouterRouteAdd(n.getRouterName(), true, networkOVN.OVNRouterRoute{NextHop: nexthop, Prefix: *listenAddressNet})
if err != nil {
return err
}

revert.Add(func() { _ = ovnnb.LogicalRouterRouteDelete(n.getRouterName(), IPToNet(vip)) })
revert.Add(func() { _ = ovnnb.LogicalRouterRouteDelete(n.getRouterName(), *listenAddressNet) })
}

// Notify all other members to refresh their BGP prefixes.
Expand Down Expand Up @@ -5307,8 +5309,12 @@ func (n *ovn) LoadBalancerDelete(listenAddress string, clientType request.Client
}

// Delete static route to load-balancer if present.
vip := IPToNet(net.ParseIP(forward.ListenAddress))
_ = ovnnb.LogicalRouterRouteDelete(n.getRouterName(), vip)
vip, err := ParseIPToNet(forward.ListenAddress)
if err != nil {
return err
}

_ = ovnnb.LogicalRouterRouteDelete(n.getRouterName(), *vip)

// Delete the database records.
err = n.state.DB.Cluster.Transaction(context.TODO(), func(ctx context.Context, tx *db.ClusterTx) error {
Expand Down
Loading