@@ -440,7 +440,7 @@ LogicalRouterLBs(lr, vec_empty()) :-
function chassis_redirect_name(port_name: string): string = "cr-${port_name}"
-relation &Router(
+typedef Router = Router {
/* Fields copied from nb::Logical_Router. */
_uuid: uuid,
name: string,
@@ -462,9 +462,12 @@ relation &Router(
mcast_cfg: Ref<McastRouterCfg>,
learn_from_arp_request: bool,
force_lb_snat: bool,
-)
+}
+
+relation Router[Intern<Router>]
-&Router(._uuid = lr._uuid,
+Router[Router{
+ ._uuid = lr._uuid,
.name = lr.name,
.static_routes = lr.static_routes,
.policies = lr.policies,
@@ -486,7 +489,7 @@ relation &Router(
.lbs = lbs,
.mcast_cfg = mcast_cfg,
.learn_from_arp_request = learn_from_arp_request,
- .force_lb_snat = force_lb_snat) :-
+ .force_lb_snat = force_lb_snat}.intern()] :-
lr in nb::Logical_Router(),
lr.is_enabled(),
LogicalRouterRedirectPort(lr._uuid, l3dgw_port),
@@ -498,7 +501,7 @@ relation &Router(
var force_lb_snat = lb_force_snat_router_ip(lr.options).
/* RouterLB: many-to-many relation between logical routers and nb::LB */
-relation RouterLB(router: Ref<Router>, lb: Ref<nb::Load_Balancer>)
+relation RouterLB(router: Intern<Router>, lb: Ref<nb::Load_Balancer>)
RouterLB(router, lb) :-
router in &Router(.lbs = lbs),
@@ -506,7 +509,7 @@ RouterLB(router, lb) :-
/* Load balancer VIPs associated with routers */
relation RouterLBVIP(
- router: Ref<Router>,
+ router: Intern<Router>,
lb: Ref<nb::Load_Balancer>,
vip: string,
backends: string)
@@ -586,7 +589,7 @@ relation &RouterPort(
lrp: nb::Logical_Router_Port,
json_name: string,
networks: lport_addresses,
- router: Ref<Router>,
+ router: Intern<Router>,
is_redirect: bool,
peer: RouterPeer,
mcast_cfg: Ref<McastPortCfg>,
@@ -721,7 +724,7 @@ function find_lrp_member_ip(networks: lport_addresses, ip: v46_ip): Option<v46_i
/* Step 1: compute router-route pairs */
relation RouterStaticRoute_(
- router : Ref<Router>,
+ router : Intern<Router>,
key : route_key,
nexthop : v46_ip,
output_port : Option<string>,
@@ -745,7 +748,7 @@ typedef route_dst = RouteDst {
}
relation RouterStaticRoute(
- router : Ref<Router>,
+ router : Intern<Router>,
key : route_key,
dsts : Set<route_dst>)
@@ -160,7 +160,7 @@ SwitchMcastFloodReportPorts(switch, set_empty()) :-
/* Mapping between Router and the set of port uuids on which to
* flood IP multicast reports statically.
*/
-relation RouterMcastFloodPorts(sw: Ref<Router>, ports: Set<uuid>)
+relation RouterMcastFloodPorts(sw: Intern<Router>, ports: Set<uuid>)
RouterMcastFloodPorts(router, flood_ports) :-
&RouterPort(
@@ -213,7 +213,7 @@ IgmpSwitchMulticastGroup(address, switch, ports) :-
*/
relation IgmpRouterGroupPort(
address: string,
- router : Ref<Router>,
+ router : Intern<Router>,
port : uuid
)
@@ -236,7 +236,7 @@ IgmpRouterGroupPort(address, rtr_port.router, rtr_port.lrp._uuid) :-
*/
relation IgmpRouterMulticastGroup(
address: string,
- router : Ref<Router>,
+ router : Intern<Router>,
ports : Set<uuid>
)
@@ -297,7 +297,7 @@ OutProxy_Port_Binding(._uuid = lrp._uuid,
}.
/*
*/
-function get_router_load_balancer_ips(router: Router) :
+function get_router_load_balancer_ips(router: Intern<Router>) :
(Set<string>, Set<string>) =
{
var all_ips_v4 = set_empty();
@@ -327,8 +327,7 @@ function get_router_load_balancer_ips(router: Router) :
function get_nat_addresses(rport: RouterPort): Set<string> =
{
var addresses = set_empty();
- var router = deref(rport.router);
- var has_redirect = router.l3dgw_port.is_some();
+ var has_redirect = rport.router.l3dgw_port.is_some();
match (eth_addr_from_string(rport.lrp.mac)) {
None -> addresses,
Some{mac} -> {
@@ -336,7 +335,7 @@ function get_nat_addresses(rport: RouterPort): Set<string> =
var central_ip_address = false;
/* Get NAT IP addresses. */
- for (nat in router.nats) {
+ for (nat in rport.router.nats) {
/* Determine whether this NAT rule satisfies the conditions for
* distributed NAT processing. */
if (has_redirect and nat.nat.__type == "dnat_and_snat" and
@@ -379,7 +378,7 @@ function get_nat_addresses(rport: RouterPort): Set<string> =
};
/* A set to hold all load-balancer vips. */
- (var all_ips_v4, var all_ips_v6) = get_router_load_balancer_ips(router);
+ (var all_ips_v4, var all_ips_v6) = get_router_load_balancer_ips(rport.router);
for (ip_address in set_union(all_ips_v4, all_ips_v6)) {
c_addresses = c_addresses ++ " ${ip_address}";
@@ -390,7 +389,7 @@ function get_nat_addresses(rport: RouterPort): Set<string> =
/* Gratuitous ARP for centralized NAT rules on distributed gateway
* ports should be restricted to the gateway chassis. */
if (has_redirect) {
- c_addresses = c_addresses ++ " is_chassis_resident(${router.redirect_port_name})"
+ c_addresses = c_addresses ++ " is_chassis_resident(${rport.router.redirect_port_name})"
} else ();
addresses.insert(c_addresses)
@@ -4048,7 +4047,7 @@ function get_arp_forward_ips(rp: Ref<RouterPort>): (Set<string>, Set<string>) =
var all_ips_v6 = set_empty();
(var lb_ips_v4, var lb_ips_v6)
- = get_router_load_balancer_ips(deref(rp.router));
+ = get_router_load_balancer_ips(rp.router);
for (a in lb_ips_v4) {
/* Check if the ovn port has a network configured on which we could
* expect ARP requests for the LB VIP.
@@ -4817,7 +4816,7 @@ LogicalRouterNatArpNdFlow(router, nat) :-
(var ip, var nats) = snat_ip,
Some{var nat} = nats.nth(0).
-relation LogicalRouterNatArpNdFlow(router: Ref<Router>, nat: NAT)
+relation LogicalRouterNatArpNdFlow(router: Intern<Router>, nat: NAT)
LogicalRouterArpNdFlow(router, nat, None, rEG_INPORT_ETH_ADDR(), None, false, 90) :-
LogicalRouterNatArpNdFlow(router, nat).
@@ -4847,7 +4846,7 @@ LogicalRouterPortNatArpNdFlow(router, nat, l3dgw_port) :-
/* Respond to ARP/NS requests on the chassis that binds the gw
* port. Drop the ARP/NS requests on other chassis.
*/
-relation LogicalRouterPortNatArpNdFlow(router: Ref<Router>, nat: NAT, lrp: nb::Logical_Router_Port)
+relation LogicalRouterPortNatArpNdFlow(router: Intern<Router>, nat: NAT, lrp: nb::Logical_Router_Port)
LogicalRouterArpNdFlow(router, nat, Some{lrp}, mac, Some{extra_match}, false, 92),
LogicalRouterArpNdFlow(router, nat, Some{lrp}, mac, None, true, 91) :-
LogicalRouterPortNatArpNdFlow(router, nat, lrp),
@@ -4878,7 +4877,7 @@ LogicalRouterArpNdFlow(router, nat, Some{lrp}, mac, None, true, 91) :-
/* Now divide the ARP/ND flows into ARP and ND. */
relation LogicalRouterArpNdFlow(
- router: Ref<Router>,
+ router: Intern<Router>,
nat: NAT,
lrp: Option<nb::Logical_Router_Port>,
mac: string,
@@ -4895,7 +4894,7 @@ LogicalRouterNdFlow(router, lrp, "nd_na", ipv6, true, mac, extra_match, drop, pr
mac, extra_match, drop, priority).
relation LogicalRouterArpFlow(
- lr: Ref<Router>,
+ lr: Intern<Router>,
lrp: Option<nb::Logical_Router_Port>,
ip: in_addr,
mac: string,
@@ -4938,7 +4937,7 @@ Flow(.logical_datapath = lr._uuid,
}.
relation LogicalRouterNdFlow(
- lr: Ref<Router>,
+ lr: Intern<Router>,
lrp: Option<nb::Logical_Router_Port>,
action: string,
ip: in6_addr,
@@ -5368,7 +5367,7 @@ function lrouter_nat_is_stateless(nat: NAT): bool = {
* and action says "next" instead of ct*.
*/
function lrouter_nat_add_ext_ip_match(
- router: Ref<Router>,
+ router: Intern<Router>,
nat: NAT,
__match: string,
ipX: string,
@@ -6414,7 +6413,7 @@ function numbered_vec(set: Set<'A>) : Vec<(bit<16>, 'A)> = {
relation EcmpGroup(
group_id: bit<16>,
- router: Ref<Router>,
+ router: Intern<Router>,
key: route_key,
dsts: Set<route_dst>,
route_match: string, // This is build_route_match(key).0
@@ -6471,7 +6470,7 @@ Flow(.logical_datapath = router._uuid,
* an ECMP route need to go through conntrack.
*/
relation EcmpSymmetricReply(
- router: Ref<Router>,
+ router: Intern<Router>,
dst: route_dst,
route_match: string,
tunkey: integer)
@@ -6693,7 +6692,7 @@ function all_same_addr_family(addrs: Set<string>): bool {
}
relation EcmpReroutePolicy(
- r: Ref<Router>,
+ r: Intern<Router>,
policy: nb::Logical_Router_Policy,
ecmp_group_id: usize
)