On 3/9/23 08:45, Ales Musil wrote: > On Wed, Mar 8, 2023 at 3:26 PM Enrique Llorente <[email protected]> wrote: > >> Configure mac address >> The mac address returned by ARP/NDP can be configured similar to LSP >> addresses where the mac is the first entry on the list >> >> IPv6 >> Support NDP IPv6 protocol >> >> Use CIDRs >> Allow to specify subnets for ipv4 and ipv6, they will match whatever >> address is received from ARP/NDP >> >> Signed-off-by: Enrique Llorente <[email protected]> >> > > Hi, > > just two nits below, but there is probably no need to spin another version. > > >> --- >> NEWS | 2 + >> northd/northd.c | 129 +++++++++++++--- >> northd/ovn-northd.8.xml | 9 ++ >> ovn-nb.xml | 17 ++- >> tests/ovn.at | 179 ++++++++++++++++++---- >> tests/system-common-macros.at | 1 + >> tests/system-ovn.at | 270 ++++++++++++++++++++++++++++++++++ >> 7 files changed, 551 insertions(+), 56 deletions(-) >> >> diff --git a/NEWS b/NEWS >> index 900825b1e..d859ae19d 100644 >> --- a/NEWS >> +++ b/NEWS >> @@ -8,6 +8,8 @@ OVN v23.03.0 - 03 Mar 2023 >> - Add ovn-ctl commands for (re)starting/stopping OVSDB relay for OVN SB >> DB. >> - Add new [email protected] systemd unit to run ovsdb-servers in separate >> systemd units. >> + - Enhance LSP.options:arp_proxy to support IPv6, configurable MAC >> + addresses and CIDRs. >> > > This needs to be under "Post v23.03.0" instead, however that can be moved > during merge. > > >> >> OVN v22.12.0 - 16 Dec 2022 >> -------------------------- >> diff --git a/northd/northd.c b/northd/northd.c >> index 33025bb5c..c61b538e7 100644 >> --- a/northd/northd.c >> +++ b/northd/northd.c >> @@ -1547,6 +1547,8 @@ struct ovn_port { >> struct ovs_list list; /* In list of similar records. */ >> >> struct ovs_list dp_node; >> + >> + struct lport_addresses proxy_arp_addrs; >> }; >> >> static bool >> @@ -1628,6 +1630,7 @@ ovn_port_create(struct hmap *ports, const char *key, >> op->sb = sb; >> ovn_port_set_nb(op, nbsp, nbrp); >> op->l3dgw_port = op->cr_port = NULL; >> + op->proxy_arp_addrs.ea = eth_addr_zero; >> hmap_insert(ports, &op->key_node, hash_string(op->key, 0)); >> return op; >> } >> @@ -1654,6 +1657,7 @@ ovn_port_destroy(struct hmap *ports, struct ovn_port >> *port) >> destroy_routable_addresses(&port->routables); >> >> destroy_lport_addresses(&port->lrp_networks); >> + destroy_lport_addresses(&port->proxy_arp_addrs); >> free(port->json_key); >> free(port->key); >> free(port); >> @@ -2704,6 +2708,20 @@ join_logical_ports(struct northd_input *input_data, >> if (peer->od && peer->od->mcast_info.rtr.relay) { >> op->od->mcast_info.sw.flood_relay = true; >> } >> + >> + /* For LSP of router type arp proxy can be activated so >> + * it needs to be parsed >> + * either takes "MAC IP1 IP2" or "IP1 IP2" >> + */ >> + const char *arp_proxy = >> smap_get(&op->nbsp->options,"arp_proxy"); >> + int ofs = 0; >> + if (arp_proxy && >> + !extract_addresses(arp_proxy, &op->proxy_arp_addrs, &ofs) >> && >> + !extract_ip_addresses(arp_proxy, &op->proxy_arp_addrs)) { >> + static struct vlog_rate_limit rl = >> VLOG_RATE_LIMIT_INIT(1, 5); >> + VLOG_WARN_RL(&rl, "Invalid arp_proxy option: '%s' at lsp >> '%s'", >> + arp_proxy, op->nbsp->name); >> + } >> } else if (op->nbrp && op->nbrp->peer && !op->l3dgw_port) { >> struct ovn_port *peer = ovn_port_find(ports, op->nbrp->peer); >> if (peer) { >> @@ -8625,29 +8643,33 @@ build_lswitch_arp_nd_responder_known_ips(struct >> ovn_port *op, >> } >> } >> } >> + if (op->proxy_arp_addrs.n_ipv4_addrs || >> + op->proxy_arp_addrs.n_ipv6_addrs) { >> + /* Select the mac address to answer the proxy ARP/NDP */ >> + char *ea_s = NULL; >> + if (!eth_addr_is_zero(op->proxy_arp_addrs.ea)) { >> + ea_s = op->proxy_arp_addrs.ea_s; >> + } else if (op->peer) { >> + ea_s = op->peer->lrp_networks.ea_s; >> + } else { >> + return; >> + } >> >> - if (op->peer) { >> - const char *arp_proxy = >> smap_get(&op->nbsp->options,"arp_proxy"); >> - >> - struct lport_addresses proxy_arp_addrs; >> int i = 0; >> - >> - /* Add responses for ARP proxies. */ >> - if (arp_proxy && extract_ip_addresses(arp_proxy, >> - &proxy_arp_addrs) && >> - proxy_arp_addrs.n_ipv4_addrs) { >> + /* Add IPv4 responses for ARP proxies. */ >> + if (op->proxy_arp_addrs.n_ipv4_addrs) { >> /* Match rule on all proxy ARP IPs. */ >> ds_clear(match); >> ds_put_cstr(match, "arp.op == 1 && arp.tpa == {"); >> >> - for (i = 0; i < proxy_arp_addrs.n_ipv4_addrs; i++) { >> - ds_put_format(match, "%s,", >> - proxy_arp_addrs.ipv4_addrs[i].addr_s); >> + for (i = 0; i < op->proxy_arp_addrs.n_ipv4_addrs; i++) { >> + ds_put_format(match, "%s/%u,", >> + >> op->proxy_arp_addrs.ipv4_addrs[i].addr_s, >> + op->proxy_arp_addrs.ipv4_addrs[i].plen); >> } >> >> ds_chomp(match, ','); >> ds_put_cstr(match, "}"); >> - destroy_lport_addresses(&proxy_arp_addrs); >> >> ds_clear(actions); >> ds_put_format(actions, >> @@ -8660,12 +8682,65 @@ build_lswitch_arp_nd_responder_known_ips(struct >> ovn_port *op, >> "outport = inport; " >> "flags.loopback = 1; " >> "output;", >> - op->peer->lrp_networks.ea_s, >> - op->peer->lrp_networks.ea_s); >> + ea_s, >> + ea_s); >> >> ovn_lflow_add_with_hint(lflows, op->od, >> S_SWITCH_IN_ARP_ND_RSP, >> 50, ds_cstr(match), ds_cstr(actions), >> &op->nbsp->header_); >> } >> + >> + /* Add IPv6 NDP responses. >> + * For ND solicitations, we need to listen for both the >> + * unicast IPv6 address and its all-nodes multicast address, >> + * but always respond with the unicast IPv6 address. */ >> + if (op->proxy_arp_addrs.n_ipv6_addrs) { >> + struct ds ip6_dst_match = DS_EMPTY_INITIALIZER; >> + struct ds nd_target_match = DS_EMPTY_INITIALIZER; >> + for (size_t j = 0; j < op->proxy_arp_addrs.n_ipv6_addrs; >> j++) { >> + ds_put_format(&ip6_dst_match, "%s/%u, %s/%u, ", >> + op->proxy_arp_addrs.ipv6_addrs[j].addr_s, >> + op->proxy_arp_addrs.ipv6_addrs[j].plen, >> + op->proxy_arp_addrs.ipv6_addrs[j].sn_addr_s, >> + op->proxy_arp_addrs.ipv6_addrs[j].plen); >> + ds_put_format(&nd_target_match, "%s/%u, ", >> + op->proxy_arp_addrs.ipv6_addrs[j].addr_s, >> + op->proxy_arp_addrs.ipv6_addrs[j].plen); >> + } >> + ds_truncate(&ip6_dst_match, ip6_dst_match.length - 2); >> + ds_truncate(&nd_target_match, nd_target_match.length - 2); >> + ds_clear(match); >> + ds_put_format(match, >> + "nd_ns " >> + "&& ip6.dst == { %s } " >> + "&& nd.target == { %s }", >> + ds_cstr(&ip6_dst_match), >> + ds_cstr(&nd_target_match)); >> + ds_clear(actions); >> + ds_put_format(actions, >> + "%s { " >> + "eth.src = %s; " >> + "ip6.src = nd.target; " >> + "nd.target = nd.target; " >> + "nd.tll = %s; " >> + "outport = inport; " >> + "flags.loopback = 1; " >> + "output; " >> + "};", >> + lsp_is_router(op->nbsp) ? "nd_na_router" : >> "nd_na", >> + ea_s, >> + ea_s); >> + ovn_lflow_add_with_hint__(lflows, op->od, >> + S_SWITCH_IN_ARP_ND_RSP, 50, >> + ds_cstr(match), >> + ds_cstr(actions), >> + NULL, >> + copp_meter_get(COPP_ND_NA, >> + op->od->nbs->copp, >> + meter_groups), >> + &op->nbsp->header_); >> + ds_destroy(&ip6_dst_match); >> + ds_destroy(&nd_target_match); >> + } >> } >> } >> } >> @@ -9104,8 +9179,15 @@ build_lswitch_ip_unicast_lookup(struct ovn_port *op, >> continue; >> } >> ds_clear(match); >> - ds_put_format(match, "eth.dst == "ETH_ADDR_FMT, >> - ETH_ADDR_ARGS(mac)); >> + ds_put_cstr(match, "eth.dst == "); >> + if (!eth_addr_is_zero(op->proxy_arp_addrs.ea)) { >> + ds_put_format(match, >> + "{ %s, "ETH_ADDR_FMT" }", >> + op->proxy_arp_addrs.ea_s, >> + ETH_ADDR_ARGS(mac)); >> + } else { >> + ds_put_format(match, ETH_ADDR_FMT, >> ETH_ADDR_ARGS(mac)); >> + } >> if (op->peer->od->n_l3dgw_ports >> && op->od->n_localnet_ports) { >> bool add_chassis_resident_check = false; >> @@ -9138,7 +9220,6 @@ build_lswitch_ip_unicast_lookup(struct ovn_port *op, >> json_key); >> } >> } >> - >> ds_clear(actions); >> ds_put_format(actions, action, op->json_key); >> ovn_lflow_add_with_hint(lflows, op->od, >> @@ -11621,8 +11702,16 @@ build_adm_ctrl_flows_for_lrouter_port( >> op->lrp_networks.ea_s); >> >> ds_clear(match); >> - ds_put_format(match, "eth.dst == %s && inport == %s", >> - op->lrp_networks.ea_s, op->json_key); >> + ds_put_cstr(match, "eth.dst == "); >> + if (op->peer && !eth_addr_is_zero(op->peer->proxy_arp_addrs.ea)) { >> + ds_put_format(match, >> + "{ %s, %s }", >> + op->peer->proxy_arp_addrs.ea_s, >> + op->lrp_networks.ea_s); >> + } else { >> + ds_put_format(match, "%s", op->lrp_networks.ea_s); >> + } >> + ds_put_format(match, " && inport == %s", op->json_key); >> if (consider_l3dgw_port_is_centralized(op)) { >> ds_put_format(match, " && is_chassis_resident(%s)", >> op->cr_port->json_key); >> diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml >> index 574d358c5..2d8154525 100644 >> --- a/northd/ovn-northd.8.xml >> +++ b/northd/ovn-northd.8.xml >> @@ -1401,6 +1401,15 @@ nd_na_router { >> database), for logical ports of type <code>virtual</code> and >> for >> logical ports with 'unknown' address set. >> </p> >> + >> + <p> >> + The above NDP responder flows are added for the list of >> + IPv6 addresses if defined in <code>options:arp_proxy</code> >> column of >> + <code>Logical_Switch_Port</code> table for logical switch ports >> of >> + type <code>router</code>. >> + </p> >> + >> + >> </li> >> >> <li> >> diff --git a/ovn-nb.xml b/ovn-nb.xml >> index 8d56d0c6e..73f707aa0 100644 >> --- a/ovn-nb.xml >> +++ b/ovn-nb.xml >> @@ -992,12 +992,17 @@ >> </column> >> >> <column name="options" key="arp_proxy"> >> - Optional. A list of IPv4 addresses that this >> - logical switch <code>router</code> port will reply to ARP >> requests. >> - Example: <code>169.254.239.254 169.254.239.2</code>. The >> - <ref column="options" key="router-port"/>'s logical router >> should >> - have a route to forward packets sent to configured proxy ARP >> IPs to >> - an appropriate destination. >> + Optional. A list of MAC and addresses/cidrs or just >> addresses/cidrs >> + that this logical switch <code>router</code> port will reply to >> + ARP/NDP requests. Examples: >> + <code>169.254.239.254 169.254.239.2</code>, >> + <code>0a:58:a9:fe:01:01 169.254.239.254 169.254.239.2 >> + 169.254.238.0/24</code>, >> + <code>fd7b:6b4d:7b25:d22f::1 fd7b:6b4d:7b25:d22f::2</code>, >> + <code>0a:58:a9:fe:01:01 fd7b:6b4d:7b25:d22f::0/64</code>. >> + The<ref column="options" key="router-port"/>'s logical router >> + should have a route to forward packets sent to configured proxy >> ARP >> + MAC/IPs to an appropriate destination. >> </column> >> </group> >> >> diff --git a/tests/ovn.at b/tests/ovn.at >> index 40d701bb2..f2472494e 100644 >> --- a/tests/ovn.at >> +++ b/tests/ovn.at >> @@ -31740,20 +31740,42 @@ AT_KEYWORDS([proxy-arp]) >> ovn_start >> >> # Logical network: >> -# One LR - lr1 has switch ls1 (192.16.1.0/24) connected to it, >> +# One LR - lr1 has switch ls1 (192.16.1.0/24) and ls2 (192.168.2.0/24) >> connected to it, >> # and and one HV with IP 192.16.1.6. >> >> ovn-nbctl lr-add lr1 >> ovn-nbctl ls-add ls1 >> +ovn-nbctl ls-add ls2 >> >> # Connect ls1 to lr1 >> -ovn-nbctl lrp-add lr1 ls1 00:00:00:01:02:f1 192.16.1.1/24 >> +ls1_ro_mac=00:00:00:01:02:f1 >> +ls1_ro_ip4=192.168.1.1 >> +ls1_ro_ip6=fd11::1 >> +ovn-nbctl lrp-add lr1 ls1 $ls1_ro_mac $ls1_ro_ip4/24 $ls1_ro_ip6/64 >> ovn-nbctl lsp-add ls1 rp-ls1 -- set Logical_Switch_Port rp-ls1 \ >> - type=router options:router-port=ls1 addresses=\"00:00:00:01:02:f1\" >> + type=router options:router-port=ls1 addresses=\"router\" >> >> # Create logical port ls1-lp1 in ls1 >> +ls1_p1_mac=00:00:00:01:02:03 >> +ls1_p1_ip4=192.16.1.6 >> +ls1_p1_ip6=fd11::2 >> ovn-nbctl lsp-add ls1 ls1-lp1 \ >> --- lsp-set-addresses ls1-lp1 "00:00:00:01:02:03 192.16.1.6" >> +-- lsp-set-addresses ls1-lp1 "$ls1_p1_mac $ls1_p1_ip4 $ls1_p1_ip6" >> + >> +# Connect ls2 to lr1 >> +ls2_ro_mac=00:00:00:01:02:f2 >> +ls2_ro_ip4=192.168.2.1 >> +ls2_ro_ip6=fd12::1 >> +ovn-nbctl lrp-add lr1 ls2 $ls2_ro_mac $ls2_ro_ip4/24 $ls2_ro_ip6/64 >> +ovn-nbctl lsp-add ls2 rp-ls2 -- set Logical_Switch_Port rp-ls2 \ >> + type=router options:router-port=ls1 addresses=\"router\" >> + >> +# Create logical port ls2-lp1 in ls2 >> +ls2_p1_mac=00:00:00:01:02:04 >> +ls2_p1_ip4=192.16.2.6 >> +ls2_p1_ip6=fd12::2 >> +ovn-nbctl lsp-add ls2 ls2-lp1 \ >> +-- lsp-set-addresses ls2-lp1 "$ls2_p1_mac $ls2_p1_ip4 $ls2_p1_ip6" >> >> # Create one hypervisor and create OVS ports corresponding to logical >> ports. >> net_add n1 >> @@ -31771,52 +31793,149 @@ ovs-vsctl -- add-port br-int vif1 -- \ >> options:rxq_pcap=hv1/vif1-rx.pcap \ >> ofport-request=1 >> >> -# And proxy ARP flows for 69.254.239.254 and 169.254.239.2 >> -# and check that SB flows have been added. >> +ovs-vsctl -- add-port br-int vif2 -- \ >> + set interface vif2 external-ids:iface-id=ls2-lp1 \ >> + options:tx_pcap=hv1/vif2-tx.pcap \ >> + options:rxq_pcap=hv1/vif2-rx.pcap \ >> + ofport-request=1 >> + >> + >> +# Two proxy arp/ndp configurations with and wihout mac both dual stack >> +# and with CIDR to check sbflows >> +arp_proxy_ls1_ip4=169.254.238.2 >> +arp_proxy_ls1_ip6=fd7b:6b4d:7b25:d22d::2 >> +arp_proxy_ls1=(169.254.238.0/24 \ >> + 169.254.239.2 \ >> + fd7b:6b4d:7b25:d22d::0/64 \ >> + fd7b:6b4d:7b25:d22f::1) >> +arp_proxy_ls1_option="\"${arp_proxy_ls1[[*]]}\"" >> + >> +arp_proxy_ls2_ip4=169.254.236.2 >> +arp_proxy_ls2_ip6=fd7b:6b4d:7b25:d22b::2 >> +arp_proxy_ls2=(00:00:00:02:02:f1 \ >> + 169.254.236.0/24 \ >> + 169.254.237.2 \ >> + fd7b:6b4d:7b25:d22b::0/64 \ >> + fd7b:6b4d:7b25:d22c::1) >> +arp_proxy_ls2_option="\"${arp_proxy_ls2[[*]]}\"" >> + >> ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls1 \ >> -options arp_proxy='"169.254.239.254 169.254.239.2"' >> +options arp_proxy="$arp_proxy_ls1_option" >> +ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls2 \ >> +options arp_proxy="$arp_proxy_ls2_option" >> ovn-sbctl dump-flows > sbflows >> AT_CAPTURE_FILE([sbflows]) >> >> -AT_CHECK([ovn-sbctl dump-flows | grep ls_in_arp_rsp | grep >> "169.254.239.2" | sed 's/table=../table=??/'], [0], [dnl >> - table=??(ls_in_arp_rsp ), priority=50 , match=(arp.op == 1 && >> arp.tpa == {169.254.239.254,169.254.239.2}), dnl >> -action=(eth.dst = eth.src; eth.src = 00:00:00:01:02:f1; arp.op = 2; /* >> ARP reply */ arp.tha = arp.sha; arp.sha = 00:00:00:01:02:f1; arp.tpa <-> >> arp.spa; outport = inport; flags.loopback = 1; output;) >> +# IPv4 LS1 Responder lflows >> +AT_CHECK([ovn-sbctl dump-flows | >> + grep ls_in_arp_rsp | >> + grep "${arp_proxy_ls1[[1]]}" | >> + sed 's/table=../table=??/'], [0], [dnl >> + table=??(ls_in_arp_rsp ), priority=50 , match=(arp.op == 1 && dnl >> +arp.tpa == {169.254.238.0/24,169.254.239.2/32} >> <http://169.254.238.0/24,169.254.239.2/32%7D>), dnl >> +action=(eth.dst = eth.src; eth.src = 00:00:00:01:02:f1; arp.op = 2; dnl >> +/* ARP reply */ arp.tha = arp.sha; arp.sha = 00:00:00:01:02:f1; dnl >> +arp.tpa <-> arp.spa; outport = inport; flags.loopback = 1; output;) >> +]) >> + >> +# IPv6 LS1 Responder lflows >> +AT_CHECK([ovn-sbctl dump-flows | >> + grep ls_in_arp_rsp | >> + grep "${arp_proxy_ls1[[3]]}" | >> + sed 's/table=../table=??/'], [0], [dnl >> + table=??(ls_in_arp_rsp ), priority=50 , dnl >> +match=(nd_ns && ip6.dst == { fd7b:6b4d:7b25:d22d::/64, ff02::1:ff00:0/64, >> dnl >> +fd7b:6b4d:7b25:d22f::1/128, ff02::1:ff00:1/128 } && dnl >> +nd.target == { fd7b:6b4d:7b25:d22d::/64, fd7b:6b4d:7b25:d22f::1/128 }), >> dnl >> +action=(nd_na_router { eth.src = 00:00:00:01:02:f1; ip6.src = nd.target; >> dnl >> +nd.target = nd.target; nd.tll = 00:00:00:01:02:f1; outport = inport; dnl >> +flags.loopback = 1; output; };) >> +]) >> + >> +# IPv4 LS2 Responder lflows >> +AT_CHECK([ovn-sbctl dump-flows | >> + grep ls_in_arp_rsp | >> + grep "${arp_proxy_ls2[[2]]}" | >> + sed 's/table=../table=??/'], [0], [dnl >> + table=??(ls_in_arp_rsp ), priority=50 , dnl >> +match=(arp.op == 1 && arp.tpa == {169.254.236.0/24,169.254.237.2/32} >> <http://169.254.236.0/24,169.254.237.2/32%7D>), dnl >> +action=(eth.dst = eth.src; eth.src = 00:00:00:02:02:f1; arp.op = 2; dnl >> +/* ARP reply */ arp.tha = arp.sha; arp.sha = 00:00:00:02:02:f1; dnl >> +arp.tpa <-> arp.spa; outport = inport; flags.loopback = 1; output;) >> +]) >> + >> +# IPv4 LS2 Responder lflows >> +AT_CHECK([ovn-sbctl dump-flows | >> + grep ls_in_arp_rsp | >> + grep "${arp_proxy_ls2[[4]]}" | >> + sed 's/table=../table=??/'], [0], [dnl >> + table=??(ls_in_arp_rsp ), priority=50 , dnl >> +match=(nd_ns && ip6.dst == { fd7b:6b4d:7b25:d22b::/64, ff02::1:ff00:0/64, >> dnl >> +fd7b:6b4d:7b25:d22c::1/128, ff02::1:ff00:1/128 } && dnl >> +nd.target == { fd7b:6b4d:7b25:d22b::/64, fd7b:6b4d:7b25:d22c::1/128 }), >> dnl >> +action=(nd_na_router { eth.src = 00:00:00:02:02:f1; ip6.src = nd.target; >> dnl >> +nd.target = nd.target; nd.tll = 00:00:00:02:02:f1; outport = inport; dnl >> +flags.loopback = 1; output; };) >> +]) >> + >> +# L2 lookup lflows >> +AT_CHECK([ovn-sbctl dump-flows | >> + grep ls_in_l2_lkup | >> + grep "${arp_proxy_ls2[[0]]}" | >> + sed 's/table=../table=??/'], [0], [dnl >> + table=??(ls_in_l2_lkup ), priority=50 , dnl >> +match=(eth.dst == { 00:00:00:02:02:f1, 00:00:00:01:02:f1 }), dnl >> +action=(outport = "rp-ls2"; output;) >> +]) >> + >> +# LR admission lflows >> +AT_CHECK([ovn-sbctl dump-flows | >> + grep lr_in_admission | >> + grep "${arp_proxy_ls2[[0]]}" | >> + sed 's/table=../table=??/'], [0], [dnl >> + table=??(lr_in_admission ), priority=50 , dnl >> +match=(eth.dst == { 00:00:00:02:02:f1, 00:00:00:01:02:f1 } && dnl >> +inport == "ls1"), action=(xreg0[[0..47]] = 00:00:00:01:02:f1; next;) >> ]) >> >> -# Remove and check that the flows have been removed >> -ovn-nbctl --wait=hv remove Logical_Switch_Port rp-ls1 options >> arp_proxy='"169.254.239.254 169.254.239.2"' >> >> -AT_CHECK([ovn-sbctl dump-flows | grep ls_in_arp_rsp | grep >> "169.254.239.2"], [1], [dnl >> +# Remove and check that the flows have been removed >> +ovn-nbctl --wait=hv remove Logical_Switch_Port rp-ls1 \ >> +options arp_proxy="$arp_proxy_ls1_option" >> +AT_CHECK([ovn-sbctl dump-flows | >> + grep ls_in_arp_rsp | >> + grep "${arp_proxy_ls1[[1]]}"], [1], [dnl >> +]) >> +ovn-nbctl --wait=hv remove Logical_Switch_Port rp-ls2 \ >> +options arp_proxy="$arp_proxy_ls2_option" >> +AT_CHECK([ovn-sbctl dump-flows | >> + grep ls_in_arp_rsp | >> + grep "${arp_proxy_ls2[[2]]}"], [1], [dnl >> ]) >> >> # Add the flows back send arp request and check we see an ARP response >> ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls1 \ >> -options arp_proxy='"169.254.239.254 169.254.239.2"' >> - >> -ls1_p1_mac=00:00:00:01:02:03 >> -ls1_p1_ip=192.16.1.6 >> - >> -ls1_ro_mac=00:00:00:01:02:f1 >> -ls1_ro_ip=192.168.1.1 >> +options arp_proxy="$arp_proxy_ls1_option" >> >> -proxy_ip1=169.254.239.254 >> -proxy_ip2=169.254.239.2 >> +ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls2 \ >> +options arp_proxy="$arp_proxy_ls2_option" >> >> bcast_mac=ff:ff:ff:ff:ff:ff >> >> -# Send ARP request for 169.254.239.254 >> +# Send ARP request for ls1 arp_proxy ipv4 /32 address >> packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && >> eth.dst==$bcast_mac && >> - arp.op==1 && arp.sha==$ls1_p1_mac && arp.spa==$ls1_p1_ip && >> - arp.tha==$bcast_mac && arp.tpa==$proxy_ip1" >> + arp.op==1 && arp.sha==$ls1_p1_mac && arp.spa==$ls1_p1_ip4 && >> + arp.tha==$bcast_mac && arp.tpa==${arp_proxy_ls1[[1]]}" >> >> as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet" >> >> -as hv1 ovs-ofctl dump-flows br-int| grep 169.254.239.254 | grep >> priority=50 > debug1 >> +as hv1 ovs-ofctl dump-flows br-int| \ >> + grep ${arp_proxy_ls1[[1]]} | grep priority=50 > debug1 >> AT_CAPTURE_FILE([debug1]) >> >> # Check if packet hit the ARP reply ovs flow >> AT_CHECK([ovs-ofctl dump-flows br-int | \ >> - grep "169.254.239.254" | \ >> + grep "${arp_proxy_ls1[[1]]}" | \ >> grep "priority=50" | \ >> grep "arp_op=1" | \ >> grep "n_packets=1" | wc -l], [0], [dnl >> @@ -31825,8 +31944,8 @@ AT_CHECK([ovs-ofctl dump-flows br-int | \ >> >> # Check that the HV gets an ARP reply >> expected="eth.src==$ls1_ro_mac && eth.dst==$ls1_p1_mac && >> - arp.op==2 && arp.sha==$ls1_ro_mac && arp.spa==$proxy_ip1 && >> - arp.tha==$ls1_p1_mac && arp.tpa==$ls1_p1_ip" >> + arp.op==2 && arp.sha==$ls1_ro_mac && >> arp.spa==${arp_proxy_ls1[[1]]} && >> + arp.tha==$ls1_p1_mac && arp.tpa==$ls1_p1_ip4" >> echo $expected | ovstest test-ovn expr-to-packets > expected >> >> OVN_CHECK_PACKETS([hv1/vif1-tx.pcap], [expected]) >> @@ -33313,7 +33432,7 @@ check ovs-vsctl add-port br-int ls0-hv -- set >> Interface ls0-hv external-ids:ifac >> check ovn-nbctl lr-add lr0 >> >> check ovn-nbctl ls-add ls0 >> -check ovn-nbctl lsp-add ls0 ls0-lr0 >> +check ovn-nbctl lsp-add ls0 ls0-lr0 >> check ovn-nbctl lsp-set-type ls0-lr0 router >> check ovn-nbctl lsp-set-addresses ls0-lr0 router >> check ovn-nbctl lrp-add lr0 lr0-ls0 00:00:00:00:00:01 10.0.0.1 >> diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at >> index d65f359a6..1600b77c4 100644 >> --- a/tests/system-common-macros.at >> +++ b/tests/system-common-macros.at >> @@ -106,6 +106,7 @@ m4_define([ADD_VETH], >> NS_CHECK_EXEC([$2], [ip link set dev $1 address $5]) >> fi >> if test -n "$6"; then >> + NS_CHECK_EXEC([$2], [ip route add $6 dev $1]) >> NS_CHECK_EXEC([$2], [ip route add default via $6]) >> fi >> on_exit "ip link del ovs-$1" >> diff --git a/tests/system-ovn.at b/tests/system-ovn.at >> index 03dd08ad8..b0bc44e8a 100644 >> --- a/tests/system-ovn.at >> +++ b/tests/system-ovn.at >> @@ -10851,3 +10851,273 @@ OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query >> port patch-.*/d >> /connection dropped.*/d"]) >> AT_CLEANUP >> ]) >> + >> +OVN_FOR_EACH_NORTHD([ >> +AT_SETUP([1 LR to test ARP proxy convinations]) >> > > The typo is still here. > > >> +AT_KEYWORDS([proxy-arp]) >> +AT_SKIP_IF([test $HAVE_TCPDUMP = no]) >> + >> +ovn_start >> +OVS_TRAFFIC_VSWITCHD_START() >> +ADD_BR([br-int]) >> + >> +# Set external-ids in br-int needed for ovn-controller >> +ovs-vsctl \ >> + -- set Open_vSwitch . external-ids:system-id=hv1 \ >> + -- set Open_vSwitch . >> external-ids:ovn-remote=unix:$ovs_base/ovn-sb/ovn-sb.sock \ >> + -- set Open_vSwitch . external-ids:ovn-encap-type=geneve \ >> + -- set Open_vSwitch . external-ids:ovn-encap-ip=169.0.0.1 \ >> + -- set bridge br-int fail-mode=secure >> other-config:disable-in-band=true >> + >> +# Start ovn-controller >> +start_daemon ovn-controller >> + >> +# Logical network: >> +# One LR - R1 and two LSs - foo and bar, R1 has switches foo ( >> 192.168.1.0/24) and >> +# bar (192.168.2.0/24) connected to it >> +# >> +# foo -- R1 -- bar >> + >> +ovn-nbctl create Logical_Router name=R1 >> + >> +ovn-nbctl ls-add foo >> +ovn-nbctl ls-add bar >> + >> +# Connect foo to R1 >> +ovn-nbctl lrp-add R1 foo 00:00:01:01:02:03 192.168.1.1/24 >> +ovn-nbctl lsp-add foo rp-foo -- set Logical_Switch_Port rp-foo \ >> + type=router options:arp_proxy="0a:58:a9:fe:01:01 169.254.239.254 >> 169.254.239.2 169.254.238.0/24 " options:router-port=foo >> addresses='"router"' >> + >> +# Connect bar to R1 >> +ovn-nbctl lrp-add R1 bar 00:00:01:01:02:04 192.168.2.1/24 >> +ovn-nbctl lsp-add bar rp-bar -- set Logical_Switch_Port rp-bar \ >> + type=router options:arp_proxy="169.254.239.253" >> options:router-port=bar addresses='"router"' >> + >> +# Logical port 'foo1' in switch 'foo'. >> +ADD_NAMESPACES(foo1) >> +ADD_VETH(foo1, foo1, br-int, "192.168.1.2/24", "f0:00:00:01:02:03", \ >> + "169.254.239.2") >> +ovn-nbctl lsp-add foo foo1 \ >> +-- lsp-set-addresses foo1 "f0:00:00:01:02:03 192.168.1.2" >> + >> +# Logical port 'foo2' in switch 'foo'. >> +ADD_NAMESPACES(foo2) >> +ADD_VETH(foo2, foo2, br-int, "192.168.1.3/24", "f0:00:00:01:02:04", \ >> + "169.254.239.254") >> +ovn-nbctl lsp-add foo foo2 \ >> +-- lsp-set-addresses foo2 "f0:00:00:01:02:04 192.168.1.3" >> + >> +# Logical port 'foo3' in switch 'foo'. >> +ADD_NAMESPACES(foo3) >> +ADD_VETH(foo3, foo3, br-int, "192.168.1.4/24", "f0:00:00:01:02:05", \ >> + "169.254.238.1") >> +ovn-nbctl lsp-add foo foo3 \ >> +-- lsp-set-addresses foo3 "f0:00:00:01:02:05 192.168.1.4" >> + >> +# Logical port 'bar1' in switch 'bar'. >> +ADD_NAMESPACES(bar1) >> +ADD_VETH(bar1, bar1, br-int, "192.168.2.2/24", "f0:00:00:01:02:06", \ >> +"169.254.239.253") >> +ovn-nbctl lsp-add bar bar1 \ >> +-- lsp-set-addresses bar1 "f0:00:00:01:02:06 192.168.2.2" >> + >> +# wait for ovn-controller to catch up. >> +ovn-nbctl --wait=hv sync >> + >> +NETNS_DAEMONIZE([foo1], [tcpdump -l -nn -e -i foo1 'ether dst >> 0a:58:a9:fe:01:01 and icmp' > foo1-icmp.pcap 2>foo1-tcpdump.stderr], >> [foo1-icmp-tcpdump.pid]) >> +OVS_WAIT_UNTIL([grep "listening" foo1-tcpdump.stderr]) >> + >> +# 'foo1' should be able to ping 'bar1' >> +NS_CHECK_EXEC([foo1], [ping -q -c 3 -i 0.3 -w 2 192.168.2.2 | >> FORMAT_PING], \ >> +[0], [dnl >> +3 packets transmitted, 3 received, 0% packet loss, time 0ms >> +]) >> +OVS_WAIT_UNTIL([ >> + total_pkts=$(cat foo1-icmp.pcap| wc -l) >> + test "${total_pkts}" = "3" >> +]) >> + >> +NETNS_DAEMONIZE([foo2], [tcpdump -l -nn -e -i foo2 'ether dst >> 0a:58:a9:fe:01:01 and icmp' > foo2-icmp.pcap 2>foo2-tcpdump.stderr], >> [foo2-icmp-tcpdump.pid]) >> +OVS_WAIT_UNTIL([grep "listening" foo2-tcpdump.stderr]) >> + >> +# 'foo2' should be able to ping 'bar1' >> +NS_CHECK_EXEC([foo2], [ping -q -c 3 -i 0.3 -w 2 192.168.2.2 | >> FORMAT_PING], \ >> +[0], [dnl >> +3 packets transmitted, 3 received, 0% packet loss, time 0ms >> +]) >> +OVS_WAIT_UNTIL([ >> + total_pkts=$(cat foo2-icmp.pcap| wc -l) >> + test "${total_pkts}" = "3" >> +]) >> + >> +NETNS_DAEMONIZE([foo3], [tcpdump -l -nn -e -i foo3 'ether dst >> 0a:58:a9:fe:01:01 and icmp' > foo3-icmp.pcap 2>foo3-tcpdump.stderr], >> [foo3-icmp-tcpdump.pid]) >> +OVS_WAIT_UNTIL([grep "listening" foo3-tcpdump.stderr]) >> + >> +# 'foo3' should be able to ping 'bar1' >> +NS_CHECK_EXEC([foo3], [ping -q -c 3 -i 0.3 -w 2 192.168.2.2 | >> FORMAT_PING], \ >> +[0], [dnl >> +3 packets transmitted, 3 received, 0% packet loss, time 0ms >> +]) >> +OVS_WAIT_UNTIL([ >> + total_pkts=$(cat foo3-icmp.pcap| wc -l) >> + test "${total_pkts}" = "3" >> +]) >> + >> + >> +OVS_APP_EXIT_AND_WAIT([ovn-controller]) >> + >> +as ovn-sb >> +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) >> + >> +as ovn-nb >> +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) >> + >> +as northd >> +OVS_APP_EXIT_AND_WAIT([NORTHD_TYPE]) >> + >> +as >> +OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d >> +/connection dropped.*/d"]) >> +AT_CLEANUP >> +]) >> + >> +OVN_FOR_EACH_NORTHD([ >> +AT_SETUP([1 LR to test ARP proxy convinations - IPv6]) >> > > Same here. > > >> +AT_KEYWORDS([proxy-arp]) >> +AT_SKIP_IF([test $HAVE_TCPDUMP = no]) >> + >> +ovn_start >> +OVS_TRAFFIC_VSWITCHD_START() >> +ADD_BR([br-int]) >> + >> +# Set external-ids in br-int needed for ovn-controller >> +ovs-vsctl \ >> + -- set Open_vSwitch . external-ids:system-id=hv1 \ >> + -- set Open_vSwitch . >> external-ids:ovn-remote=unix:$ovs_base/ovn-sb/ovn-sb.sock \ >> + -- set Open_vSwitch . external-ids:ovn-encap-type=geneve \ >> + -- set Open_vSwitch . external-ids:ovn-encap-ip=169.0.0.1 \ >> + -- set bridge br-int fail-mode=secure >> other-config:disable-in-band=true >> + >> +# Start ovn-controller >> +start_daemon ovn-controller >> + >> +# Logical network: >> +# One LR - R1 and two LSs - foo and bar, R1 has switches foo (fd11::/64) >> and >> +# bar (fd12::/64) connected to it >> +# >> +# foo -- R1 -- bar >> + >> +ovn-nbctl create Logical_Router name=R1 >> + >> +ovn-nbctl ls-add foo >> +ovn-nbctl ls-add bar >> + >> +# Connect foo to R1 >> +ovn-nbctl lrp-add R1 foo 00:00:01:01:02:03 fd11::1/64 >> +ovn-nbctl lsp-add foo rp-foo -- set Logical_Switch_Port rp-foo \ >> + type=router options:arp_proxy="0a:58:a9:fe:01:01 >> fd7b:6b4d:7b25:d22f::1 fd7b:6b4d:7b25:d22f::2 fd7b:6b4d:7b25:d22d::0/64" >> options:router-port=foo addresses='"router"' >> + >> +# Connect bar to R1 >> +ovn-nbctl lrp-add R1 bar 00:00:01:01:02:04 fd12::1/64 >> +ovn-nbctl lsp-add bar rp-bar -- set Logical_Switch_Port rp-bar \ >> + type=router options:arp_proxy="fd7b:6b4d:7b25:d22f::3" >> options:router-port=bar addresses='"router"' >> + >> +# Logical port 'foo1' in switch 'foo'. >> +ADD_NAMESPACES(foo1) >> +ADD_VETH(foo1, foo1, br-int, "fd11::2/64", "f0:00:00:01:02:03", \ >> + "fd7b:6b4d:7b25:d22f::1") >> +OVS_WAIT_UNTIL([test "$(ip netns exec foo1 ip a | grep fd11::2 | grep >> tentative)" = ""]) >> +ovn-nbctl lsp-add foo foo1 \ >> +-- lsp-set-addresses foo1 "f0:00:00:01:02:03 fd11::2" >> + >> +# Logical port 'foo2' in switch 'foo'. >> +ADD_NAMESPACES(foo2) >> +ADD_VETH(foo2, foo2, br-int, "fd11::3/64", "f0:00:00:01:02:04", \ >> + "fd7b:6b4d:7b25:d22f::2") >> +OVS_WAIT_UNTIL([test "$(ip netns exec foo2 ip a | grep fd11::3 | grep >> tentative)" = ""]) >> +ovn-nbctl lsp-add foo foo2 \ >> +-- lsp-set-addresses foo2 "f0:00:00:01:02:04 fd11::3" >> + >> +# Logical port 'foo3' in switch 'foo'. >> +ADD_NAMESPACES(foo3) >> +ADD_VETH(foo3, foo3, br-int, "fd11::4/64", "f0:00:00:01:02:05", \ >> + "fd7b:6b4d:7b25:d22d::1") >> +OVS_WAIT_UNTIL([test "$(ip netns exec foo3 ip a | grep fd11::4 | grep >> tentative)" = ""]) >> +ovn-nbctl lsp-add foo foo3 \ >> +-- lsp-set-addresses foo3 "f0:00:00:01:02:05 fd11::4" >> + >> +# Logical port 'bar1' in switch 'bar'. >> +ADD_NAMESPACES(bar1) >> +ADD_VETH(bar1, bar1, br-int, "fd12::2/64", "f0:00:00:01:02:06", \ >> +"fd7b:6b4d:7b25:d22f::3") >> +OVS_WAIT_UNTIL([test "$(ip netns exec foo1 ip a | grep fd12::2 | grep >> tentative)" = ""]) >> +ovn-nbctl lsp-add bar bar1 \ >> +-- lsp-set-addresses bar1 "f0:00:00:01:02:06 fd12::2" >> + >> +# wait for ovn-controller to catch up. >> +ovn-nbctl --wait=hv sync >> + >> +# Force ipv6 nd neighbour solicitation >> +NS_EXEC([foo1], [ping6 -c 1 fd12::2]) >> + >> +NETNS_DAEMONIZE([foo1], [tcpdump -vvvv -ttt -l -nn -e -i foo1 'ether dst >> 0a:58:a9:fe:01:01 and icmp6' > foo1-icmp6.pcap 2> foo1-tcpdump.stderr], >> [foo1-icmp6-tcpdump.pid]) >> +OVS_WAIT_UNTIL([grep "listening" foo1-tcpdump.stderr]) >> + >> +# 'foo1' should be able to ping 'bar1' >> +NS_CHECK_EXEC([foo1], [ping6 -v -q -c 3 -i 0.3 -w 2 fd12::2 | >> FORMAT_PING], \ >> +[0], [dnl >> +3 packets transmitted, 3 received, 0% packet loss, time 0ms >> +]) >> +OVS_WAIT_UNTIL([ >> + total_pkts=$(cat foo1-icmp6.pcap| grep "echo request" | wc -l) >> + test "${total_pkts}" = "3" >> +]) >> + >> +# Force ipv6 nd neighbour solicitation >> +NS_EXEC([foo2], [ping6 -c 1 fd12::2]) >> + >> +NETNS_DAEMONIZE([foo2], [tcpdump -vvvv -ttt -l -nn -e -i foo2 'ether dst >> 0a:58:a9:fe:01:01 and icmp6' > foo2-icmp6.pcap 2> foo2-tcpdump.stderr], >> [foo2-icmp6-tcpdump.pid]) >> +OVS_WAIT_UNTIL([grep "listening" foo2-tcpdump.stderr]) >> + >> +# 'foo2' should be able to ping 'bar1' >> +NS_CHECK_EXEC([foo2], [ping6 -v -q -c 3 -i 0.3 -w 2 fd12::2 | >> FORMAT_PING], \ >> +[0], [dnl >> +3 packets transmitted, 3 received, 0% packet loss, time 0ms >> +]) >> +OVS_WAIT_UNTIL([ >> + total_pkts=$(cat foo2-icmp6.pcap| grep "echo request" | wc -l) >> + test "${total_pkts}" = "3" >> +]) >> + >> +# Force ipv6 nd neighbour solicitation >> +NS_EXEC([foo3], [ping6 -c 1 fd12::2]) >> + >> +NETNS_DAEMONIZE([foo3], [tcpdump -vvvv -ttt -l -nn -e -i foo3 'ether dst >> 0a:58:a9:fe:01:01 and icmp6' > foo3-icmp6.pcap 2> foo3-tcpdump.stderr], >> [foo3-icmp6-tcpdump.pid]) >> +OVS_WAIT_UNTIL([grep "listening" foo3-tcpdump.stderr]) >> + >> +# 'foo3' should be able to ping 'bar1' >> +NS_CHECK_EXEC([foo3], [ping6 -v -q -c 3 -i 0.3 -w 2 fd12::2 | >> FORMAT_PING], \ >> +[0], [dnl >> +3 packets transmitted, 3 received, 0% packet loss, time 0ms >> +]) >> +OVS_WAIT_UNTIL([ >> + total_pkts=$(cat foo3-icmp6.pcap| grep "echo request" | wc -l) >> + test "${total_pkts}" = "3" >> +]) >> + >> +OVS_APP_EXIT_AND_WAIT([ovn-controller]) >> + >> +as ovn-sb >> +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) >> + >> +as ovn-nb >> +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) >> + >> +as northd >> +OVS_APP_EXIT_AND_WAIT([NORTHD_TYPE]) >> + >> +as >> +OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d >> +/connection dropped.*/d"]) >> +AT_CLEANUP >> +]) >> -- >> 2.32.0 >> >> _______________________________________________ >> dev mailing list >> [email protected] >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> >> > cc @Dumitru Ceara <[email protected]> > > Dumitru if you'll fix those during merge then: > > Acked-by: Ales Musil <[email protected]> >
Hi Enrique and Ales, I had another look at this version and I think I'd apply it with the following minor addendum. Let me know if it looks OK with you and I can squash it at apply time. Regards, Dumitru diff --git a/NEWS b/NEWS index d859ae19d3..637adcff35 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ Post v23.03.0 ------------- + - Enhance LSP.options:arp_proxy to support IPv6, configurable MAC + addresses and CIDRs. OVN v23.03.0 - 03 Mar 2023 -------------------------- @@ -8,8 +10,6 @@ OVN v23.03.0 - 03 Mar 2023 - Add ovn-ctl commands for (re)starting/stopping OVSDB relay for OVN SB DB. - Add new [email protected] systemd unit to run ovsdb-servers in separate systemd units. - - Enhance LSP.options:arp_proxy to support IPv6, configurable MAC - addresses and CIDRs. OVN v22.12.0 - 16 Dec 2022 -------------------------- diff --git a/northd/northd.c b/northd/northd.c index 81ad2619da..58e04210b5 100644 --- a/northd/northd.c +++ b/northd/northd.c @@ -1630,7 +1630,6 @@ ovn_port_create(struct hmap *ports, const char *key, op->sb = sb; ovn_port_set_nb(op, nbsp, nbrp); op->l3dgw_port = op->cr_port = NULL; - op->proxy_arp_addrs.ea = eth_addr_zero; hmap_insert(ports, &op->key_node, hash_string(op->key, 0)); return op; } @@ -9224,6 +9223,7 @@ build_lswitch_ip_unicast_lookup(struct ovn_port *op, json_key); } } + ds_clear(actions); ds_put_format(actions, action, op->json_key); ovn_lflow_add_with_hint(lflows, op->od, diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml index 0d5546e138..5d513e65a5 100644 --- a/northd/ovn-northd.8.xml +++ b/northd/ovn-northd.8.xml @@ -1408,8 +1408,6 @@ nd_na_router { <code>Logical_Switch_Port</code> table for logical switch ports of type <code>router</code>. </p> - - </li> <li> diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 59be69c39a..f89904a68d 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -11018,7 +11018,7 @@ AT_CLEANUP ]) OVN_FOR_EACH_NORTHD([ -AT_SETUP([1 LR to test ARP proxy convinations]) +AT_SETUP([1 LR to test ARP proxy combinations]) AT_KEYWORDS([proxy-arp]) AT_SKIP_IF([test $HAVE_TCPDUMP = no]) @@ -11043,51 +11043,50 @@ start_daemon ovn-controller # # foo -- R1 -- bar -ovn-nbctl create Logical_Router name=R1 - -ovn-nbctl ls-add foo -ovn-nbctl ls-add bar +check ovn-nbctl lr-add R1 +check ovn-nbctl ls-add foo +check ovn-nbctl ls-add bar # Connect foo to R1 -ovn-nbctl lrp-add R1 foo 00:00:01:01:02:03 192.168.1.1/24 -ovn-nbctl lsp-add foo rp-foo -- set Logical_Switch_Port rp-foo \ +check ovn-nbctl lrp-add R1 foo 00:00:01:01:02:03 192.168.1.1/24 +check ovn-nbctl lsp-add foo rp-foo -- set Logical_Switch_Port rp-foo \ type=router options:arp_proxy="0a:58:a9:fe:01:01 169.254.239.254 169.254.239.2 169.254.238.0/24 " options:router-port=foo addresses='"router"' # Connect bar to R1 -ovn-nbctl lrp-add R1 bar 00:00:01:01:02:04 192.168.2.1/24 -ovn-nbctl lsp-add bar rp-bar -- set Logical_Switch_Port rp-bar \ +check ovn-nbctl lrp-add R1 bar 00:00:01:01:02:04 192.168.2.1/24 +check ovn-nbctl lsp-add bar rp-bar -- set Logical_Switch_Port rp-bar \ type=router options:arp_proxy="169.254.239.253" options:router-port=bar addresses='"router"' # Logical port 'foo1' in switch 'foo'. ADD_NAMESPACES(foo1) ADD_VETH(foo1, foo1, br-int, "192.168.1.2/24", "f0:00:00:01:02:03", \ "169.254.239.2") -ovn-nbctl lsp-add foo foo1 \ +check ovn-nbctl lsp-add foo foo1 \ -- lsp-set-addresses foo1 "f0:00:00:01:02:03 192.168.1.2" # Logical port 'foo2' in switch 'foo'. ADD_NAMESPACES(foo2) ADD_VETH(foo2, foo2, br-int, "192.168.1.3/24", "f0:00:00:01:02:04", \ "169.254.239.254") -ovn-nbctl lsp-add foo foo2 \ +check ovn-nbctl lsp-add foo foo2 \ -- lsp-set-addresses foo2 "f0:00:00:01:02:04 192.168.1.3" # Logical port 'foo3' in switch 'foo'. ADD_NAMESPACES(foo3) ADD_VETH(foo3, foo3, br-int, "192.168.1.4/24", "f0:00:00:01:02:05", \ "169.254.238.1") -ovn-nbctl lsp-add foo foo3 \ +check ovn-nbctl lsp-add foo foo3 \ -- lsp-set-addresses foo3 "f0:00:00:01:02:05 192.168.1.4" # Logical port 'bar1' in switch 'bar'. ADD_NAMESPACES(bar1) ADD_VETH(bar1, bar1, br-int, "192.168.2.2/24", "f0:00:00:01:02:06", \ "169.254.239.253") -ovn-nbctl lsp-add bar bar1 \ +check ovn-nbctl lsp-add bar bar1 \ -- lsp-set-addresses bar1 "f0:00:00:01:02:06 192.168.2.2" # wait for ovn-controller to catch up. -ovn-nbctl --wait=hv sync +check ovn-nbctl --wait=hv sync NETNS_DAEMONIZE([foo1], [tcpdump -l -nn -e -i foo1 'ether dst 0a:58:a9:fe:01:01 and icmp' > foo1-icmp.pcap 2>foo1-tcpdump.stderr], [foo1-icmp-tcpdump.pid]) OVS_WAIT_UNTIL([grep "listening" foo1-tcpdump.stderr]) @@ -11147,7 +11146,7 @@ AT_CLEANUP ]) OVN_FOR_EACH_NORTHD([ -AT_SETUP([1 LR to test ARP proxy convinations - IPv6]) +AT_SETUP([1 LR to test ARP proxy combinations - IPv6]) AT_KEYWORDS([proxy-arp]) AT_SKIP_IF([test $HAVE_TCPDUMP = no]) @@ -11172,19 +11171,18 @@ start_daemon ovn-controller # # foo -- R1 -- bar -ovn-nbctl create Logical_Router name=R1 - -ovn-nbctl ls-add foo -ovn-nbctl ls-add bar +check ovn-nbctl lr-add R1 +check ovn-nbctl ls-add foo +check ovn-nbctl ls-add bar # Connect foo to R1 -ovn-nbctl lrp-add R1 foo 00:00:01:01:02:03 fd11::1/64 -ovn-nbctl lsp-add foo rp-foo -- set Logical_Switch_Port rp-foo \ +check ovn-nbctl lrp-add R1 foo 00:00:01:01:02:03 fd11::1/64 +check ovn-nbctl lsp-add foo rp-foo -- set Logical_Switch_Port rp-foo \ type=router options:arp_proxy="0a:58:a9:fe:01:01 fd7b:6b4d:7b25:d22f::1 fd7b:6b4d:7b25:d22f::2 fd7b:6b4d:7b25:d22d::0/64" options:router-port=foo addresses='"router"' # Connect bar to R1 -ovn-nbctl lrp-add R1 bar 00:00:01:01:02:04 fd12::1/64 -ovn-nbctl lsp-add bar rp-bar -- set Logical_Switch_Port rp-bar \ +check ovn-nbctl lrp-add R1 bar 00:00:01:01:02:04 fd12::1/64 +check ovn-nbctl lsp-add bar rp-bar -- set Logical_Switch_Port rp-bar \ type=router options:arp_proxy="fd7b:6b4d:7b25:d22f::3" options:router-port=bar addresses='"router"' # Logical port 'foo1' in switch 'foo'. @@ -11192,7 +11190,7 @@ ADD_NAMESPACES(foo1) ADD_VETH(foo1, foo1, br-int, "fd11::2/64", "f0:00:00:01:02:03", \ "fd7b:6b4d:7b25:d22f::1") OVS_WAIT_UNTIL([test "$(ip netns exec foo1 ip a | grep fd11::2 | grep tentative)" = ""]) -ovn-nbctl lsp-add foo foo1 \ +check ovn-nbctl lsp-add foo foo1 \ -- lsp-set-addresses foo1 "f0:00:00:01:02:03 fd11::2" # Logical port 'foo2' in switch 'foo'. @@ -11200,7 +11198,7 @@ ADD_NAMESPACES(foo2) ADD_VETH(foo2, foo2, br-int, "fd11::3/64", "f0:00:00:01:02:04", \ "fd7b:6b4d:7b25:d22f::2") OVS_WAIT_UNTIL([test "$(ip netns exec foo2 ip a | grep fd11::3 | grep tentative)" = ""]) -ovn-nbctl lsp-add foo foo2 \ +check ovn-nbctl lsp-add foo foo2 \ -- lsp-set-addresses foo2 "f0:00:00:01:02:04 fd11::3" # Logical port 'foo3' in switch 'foo'. @@ -11208,7 +11206,7 @@ ADD_NAMESPACES(foo3) ADD_VETH(foo3, foo3, br-int, "fd11::4/64", "f0:00:00:01:02:05", \ "fd7b:6b4d:7b25:d22d::1") OVS_WAIT_UNTIL([test "$(ip netns exec foo3 ip a | grep fd11::4 | grep tentative)" = ""]) -ovn-nbctl lsp-add foo foo3 \ +check ovn-nbctl lsp-add foo foo3 \ -- lsp-set-addresses foo3 "f0:00:00:01:02:05 fd11::4" # Logical port 'bar1' in switch 'bar'. @@ -11216,11 +11214,11 @@ ADD_NAMESPACES(bar1) ADD_VETH(bar1, bar1, br-int, "fd12::2/64", "f0:00:00:01:02:06", \ "fd7b:6b4d:7b25:d22f::3") OVS_WAIT_UNTIL([test "$(ip netns exec foo1 ip a | grep fd12::2 | grep tentative)" = ""]) -ovn-nbctl lsp-add bar bar1 \ +check ovn-nbctl lsp-add bar bar1 \ -- lsp-set-addresses bar1 "f0:00:00:01:02:06 fd12::2" # wait for ovn-controller to catch up. -ovn-nbctl --wait=hv sync +check ovn-nbctl --wait=hv sync # Force ipv6 nd neighbour solicitation NS_EXEC([foo1], [ping6 -c 1 fd12::2]) @@ -11229,7 +11227,7 @@ NETNS_DAEMONIZE([foo1], [tcpdump -vvvv -ttt -l -nn -e -i foo1 'ether dst 0a:58:a OVS_WAIT_UNTIL([grep "listening" foo1-tcpdump.stderr]) # 'foo1' should be able to ping 'bar1' -NS_CHECK_EXEC([foo1], [ping6 -v -q -c 3 -i 0.3 -w 2 fd12::2 | FORMAT_PING], \ +NS_CHECK_EXEC([foo1], [ping6 -q -c 3 -i 0.3 -w 2 fd12::2 | FORMAT_PING], \ [0], [dnl 3 packets transmitted, 3 received, 0% packet loss, time 0ms ]) @@ -11245,7 +11243,7 @@ NETNS_DAEMONIZE([foo2], [tcpdump -vvvv -ttt -l -nn -e -i foo2 'ether dst 0a:58:a OVS_WAIT_UNTIL([grep "listening" foo2-tcpdump.stderr]) # 'foo2' should be able to ping 'bar1' -NS_CHECK_EXEC([foo2], [ping6 -v -q -c 3 -i 0.3 -w 2 fd12::2 | FORMAT_PING], \ +NS_CHECK_EXEC([foo2], [ping6 -q -c 3 -i 0.3 -w 2 fd12::2 | FORMAT_PING], \ [0], [dnl 3 packets transmitted, 3 received, 0% packet loss, time 0ms ]) @@ -11261,7 +11259,7 @@ NETNS_DAEMONIZE([foo3], [tcpdump -vvvv -ttt -l -nn -e -i foo3 'ether dst 0a:58:a OVS_WAIT_UNTIL([grep "listening" foo3-tcpdump.stderr]) # 'foo3' should be able to ping 'bar1' -NS_CHECK_EXEC([foo3], [ping6 -v -q -c 3 -i 0.3 -w 2 fd12::2 | FORMAT_PING], \ +NS_CHECK_EXEC([foo3], [ping6 -q -c 3 -i 0.3 -w 2 fd12::2 | FORMAT_PING], \ [0], [dnl 3 packets transmitted, 3 received, 0% packet loss, time 0ms ]) --- _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
