From patchwork Thu Jan 9 13:37:42 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lorenzo Bianconi
X-Patchwork-Id: 1220375
Return-Path:
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized)
smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137;
helo=fraxinus.osuosl.org;
envelope-from=ovs-dev-bounces@openvswitch.org;
receiver=)
Authentication-Results: ozlabs.org;
dmarc=fail (p=none dis=none) header.from=redhat.com
Authentication-Results: ozlabs.org;
dkim=fail reason="signature verification failed" (1024-bit key;
unprotected) header.d=redhat.com header.i=@redhat.com
header.a=rsa-sha256 header.s=mimecast20190719
header.b=O8xIspNX; dkim-atps=neutral
Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
bits)) (No client certificate requested)
by ozlabs.org (Postfix) with ESMTPS id 47tnHd2GLlz9sPJ
for ;
Fri, 10 Jan 2020 00:38:05 +1100 (AEDT)
Received: from localhost (localhost [127.0.0.1])
by fraxinus.osuosl.org (Postfix) with ESMTP id F07AE8647F;
Thu, 9 Jan 2020 13:38:02 +0000 (UTC)
X-Virus-Scanned: amavisd-new at osuosl.org
Received: from fraxinus.osuosl.org ([127.0.0.1])
by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id q8ZZNx33m7eG; Thu, 9 Jan 2020 13:38:01 +0000 (UTC)
Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56])
by fraxinus.osuosl.org (Postfix) with ESMTP id 93EE08559B;
Thu, 9 Jan 2020 13:38:01 +0000 (UTC)
Received: from lf-lists.osuosl.org (localhost [127.0.0.1])
by lists.linuxfoundation.org (Postfix) with ESMTP id 76355C1796;
Thu, 9 Jan 2020 13:38:01 +0000 (UTC)
X-Original-To: dev@openvswitch.org
Delivered-To: ovs-dev@lists.linuxfoundation.org
Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])
by lists.linuxfoundation.org (Postfix) with ESMTP id ED0B4C0881
for ; Thu, 9 Jan 2020 13:37:59 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
by fraxinus.osuosl.org (Postfix) with ESMTP id DCB8E8559B
for ; Thu, 9 Jan 2020 13:37:59 +0000 (UTC)
X-Virus-Scanned: amavisd-new at osuosl.org
Received: from fraxinus.osuosl.org ([127.0.0.1])
by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id IZv19n5ykGHw for ;
Thu, 9 Jan 2020 13:37:58 +0000 (UTC)
X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com
[205.139.110.61])
by fraxinus.osuosl.org (Postfix) with ESMTPS id 971B4863BB
for ; Thu, 9 Jan 2020 13:37:58 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1578577077;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=E1n6Tw/Lbw82oSKIAmyCqcey8DUUHo9Am79lPlZWoEM=;
b=O8xIspNXDpRGp4/hryo1HoPlIudrDTEuo302tI8BrwUy9jGMwHaT3kGl/6WLhzwFQ3efom
vh/TUg0iSiPDYQpu0o/diDoFJSW6DtUIT14+8jYibCJeaPJvoB74I1B4Y/P1cpENDqcD3l
sRgBuR3yJSXsYyipR4uZaSDNp6E5l3Y=
Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com
[209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-258-ZvmyN_3VOeqsEj-yfnVdfQ-1; Thu, 09 Jan 2020 08:37:53 -0500
Received: by mail-wm1-f72.google.com with SMTP id t16so932668wmt.4
for ; Thu, 09 Jan 2020 05:37:53 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=CJjSsGRCQgYpQ+MGM9lMA0SC6h8Gh8rfn+tpAbktO9E=;
b=MSIHwfrPNuKwUFDKMlXCNTj/KHzPZcn5b0X9oH7SypsSKT/CE+OEtBvf7EqC7ymDs8
1RGpmdnsH79LKGFw6Xybj4igyMg5Wylq9785BwsI8uND0GOQZl/DxNAa9c/G7+w1R/CV
E45odNuN9/cD1MJwTWVnBU4u8Efb65KC0YSUVRQn7p5ewcrJBj+e0OYA5yh3Vd9pR9Q6
FYThVc+EwcvHsQfPwi+RtgmhCh+7c0BxQxjgDpCQ1B2YllW7ZVuE8tETVUBrLmdeCrJN
3v/03sBTRAB9K+sa6uo3FrujUxCcDqz6EVzds94NRdtZI+oz+z1iyuLbevn+Qdh2eeFS
QqgQ==
X-Gm-Message-State: APjAAAXybf66IQVlYPfS/xGbAJ+YNY9RB0jf4U6HdllmLtahegDZxeV7
IW5hZP2cZKfC280HdJVqoUgdcZBca1++C6JxdZAWVoiwpqS8iTiTvB7Rhb3Tfrc6X1yy0MD0aqo
9yHd5ctKe71Ep
X-Received: by 2002:a5d:534d:: with SMTP id
t13mr11068429wrv.77.1578577071835;
Thu, 09 Jan 2020 05:37:51 -0800 (PST)
X-Google-Smtp-Source:
APXvYqyNlNS1gdNjHitcgVjyt8vKP9R2IPLLXEzd/3xvrpu4vKGwKEH6XDYpx9mvVFhwMdLYtLPy8A==
X-Received: by 2002:a5d:534d:: with SMTP id
t13mr11068387wrv.77.1578577071396;
Thu, 09 Jan 2020 05:37:51 -0800 (PST)
Received: from localhost.localdomain.com (mob-176-246-50-46.net.vodafone.it.
[176.246.50.46]) by smtp.gmail.com with ESMTPSA id
a1sm8116887wrr.80.2020.01.09.05.37.50
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 09 Jan 2020 05:37:50 -0800 (PST)
From: Lorenzo Bianconi
To: dev@openvswitch.org
Date: Thu, 9 Jan 2020 14:37:42 +0100
Message-Id:
<2e46181f433e129ebabf4d989f91cd66caa7272e.1578576806.git.lorenzo.bianconi@redhat.com>
X-Mailer: git-send-email 2.21.1
In-Reply-To:
References:
MIME-Version: 1.0
X-MC-Unique: ZvmyN_3VOeqsEj-yfnVdfQ-1
X-Mimecast-Spam-Score: 0
Subject: [ovs-dev] [PATCH v5 ovn 2/2] northd: add logical flows for dhcpv6
pfd parsing
X-BeenThere: ovs-dev@openvswitch.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Errors-To: ovs-dev-bounces@openvswitch.org
Sender: "dev"
Introduce logical flows in ovn router pipeline in order to parse dhcpv6
advertise/reply from IPv6 prefix delegation router.
Do not overwrite ipv6_ra_pd_list info in options column of SB port_binding
table written by ovn-controller
Signed-off-by: Lorenzo Bianconi
---
northd/ovn-northd.c | 74 +++++++++++++++++++++++++-
ovn-nb.xml | 17 ++++++
tests/atlocal.in | 5 +-
tests/system-ovn.at | 127 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 221 insertions(+), 2 deletions(-)
diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c
index d91a008b7..0c99a2e05 100644
--- a/northd/ovn-northd.c
+++ b/northd/ovn-northd.c
@@ -2653,6 +2653,8 @@ ovn_port_update_sbrec(struct northd_context *ctx,
struct sset *active_ha_chassis_grps)
{
sbrec_port_binding_set_datapath(op->sb, op->od->sb);
+ const char *ipv6_pd_list = NULL;
+
if (op->nbrp) {
/* If the router is for l3 gateway, it resides on a chassis
* and its port type is "l3gateway". */
@@ -2775,6 +2777,12 @@ ovn_port_update_sbrec(struct northd_context *ctx,
smap_add(&new, "l3gateway-chassis", chassis_name);
}
}
+
+ ipv6_pd_list = smap_get(&op->sb->options, "ipv6_ra_pd_list");
+ if (ipv6_pd_list) {
+ smap_add(&new, "ipv6_ra_pd_list", ipv6_pd_list);
+ }
+
sbrec_port_binding_set_options(op->sb, &new);
smap_destroy(&new);
@@ -2824,6 +2832,12 @@ ovn_port_update_sbrec(struct northd_context *ctx,
smap_add_format(&options,
"qdisc_queue_id", "%d", queue_id);
}
+
+ ipv6_pd_list = smap_get(&op->sb->options, "ipv6_ra_pd_list");
+ if (ipv6_pd_list) {
+ smap_add(&options, "ipv6_ra_pd_list", ipv6_pd_list);
+ }
+
sbrec_port_binding_set_options(op->sb, &options);
smap_destroy(&options);
if (ovn_is_known_nb_lsp_type(op->nbsp->type)) {
@@ -2873,6 +2887,12 @@ ovn_port_update_sbrec(struct northd_context *ctx,
if (chassis) {
smap_add(&new, "l3gateway-chassis", chassis);
}
+
+ ipv6_pd_list = smap_get(&op->sb->options, "ipv6_ra_pd_list");
+ if (ipv6_pd_list) {
+ smap_add(&new, "ipv6_ra_pd_list", ipv6_pd_list);
+ }
+
sbrec_port_binding_set_options(op->sb, &new);
smap_destroy(&new);
} else {
@@ -7129,6 +7149,11 @@ copy_ra_to_sb(struct ovn_port *op, const char *address_mode)
}
ds_put_format(&s, "%s/%u ", addrs->network_s, addrs->plen);
}
+
+ const char *ra_pd_list = smap_get(&op->sb->options, "ipv6_ra_pd_list");
+ if (ra_pd_list) {
+ ds_put_cstr(&s, ra_pd_list);
+ }
/* Remove trailing space */
ds_chomp(&s, ' ');
smap_add(&options, "ipv6_ra_prefixes", ds_cstr(&s));
@@ -7843,7 +7868,36 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports,
free(snat_ips);
}
- /* Logical router ingress table 3: IP Input for IPv6. */
+ /* DHCPv6 reply handling */
+ HMAP_FOR_EACH (op, key_node, ports) {
+ if (!op->nbrp) {
+ continue;
+ }
+
+ if (op->derived) {
+ continue;
+ }
+
+ struct lport_addresses lrp_networks;
+ if (!extract_lrp_networks(op->nbrp, &lrp_networks)) {
+ continue;
+ }
+
+ for (size_t i = 0; i < lrp_networks.n_ipv6_addrs; i++) {
+ ds_clear(&actions);
+ ds_clear(&match);
+ ds_put_format(&match, "ip6.dst == %s && udp.src == 547 &&"
+ " udp.dst == 546",
+ lrp_networks.ipv6_addrs[i].addr_s);
+ ds_put_format(&actions, "reg0 = 0; handle_dhcpv6_reply { "
+ "eth.dst <-> eth.src; ip6.dst <-> ip6.src; "
+ "outport <-> inport; output; };");
+ ovn_lflow_add(lflows, op->od, S_ROUTER_IN_IP_INPUT, 100,
+ ds_cstr(&match), ds_cstr(&actions));
+ }
+ }
+
+ /* Logical router ingress table 1: IP Input for IPv6. */
HMAP_FOR_EACH (op, key_node, ports) {
if (!op->nbrp) {
continue;
@@ -8644,6 +8698,24 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports,
continue;
}
+ struct smap options;
+ /* enable IPv6 prefix delegation */
+ bool prefix_delegation = smap_get_bool(&op->nbrp->options,
+ "prefix_delegation", false);
+ if (prefix_delegation) {
+ smap_clone(&options, &op->sb->options);
+ smap_add(&options, "ipv6_prefix_delegation", "true");
+ sbrec_port_binding_set_options(op->sb, &options);
+ smap_destroy(&options);
+ }
+
+ if (smap_get_bool(&op->nbrp->options, "prefix", false)) {
+ smap_clone(&options, &op->sb->options);
+ smap_add(&options, "ipv6_prefix", "true");
+ sbrec_port_binding_set_options(op->sb, &options);
+ smap_destroy(&options);
+ }
+
const char *address_mode = smap_get(
&op->nbrp->ipv6_ra_configs, "address_mode");
diff --git a/ovn-nb.xml b/ovn-nb.xml
index 5ae52bbde..d7fddcae2 100644
--- a/ovn-nb.xml
+++ b/ovn-nb.xml
@@ -2142,6 +2142,23 @@
to true
.
+
+
+
+ If set to true
, enable IPv6 prefix delegation state
+ machine on this logical router port (RFC3633). IPv6 prefix
+ delegation is available just on a gateway router or on a gateway
+ router port.
+
+
+
+
+
+ If set to true
, this interface will receive an IPv6
+ prefix according to RFC3663
+
+
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 5f14c3da0..8f3ff03b9 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -157,7 +157,7 @@ find_command()
{
which $1 > /dev/null 2>&1
status=$?
- var=HAVE_`echo "$1" | tr '[a-z]' '[A-Z]'`
+ var=HAVE_`echo "$1" | tr '-' '_' | tr '[a-z]' '[A-Z]'`
if test "$status" = "0"; then
eval ${var}="yes"
else
@@ -192,6 +192,9 @@ else
DIFF_SUPPORTS_NORMAL_FORMAT=no
fi
+# Set HAVE_DIBBLER-SERVER
+find_command dibbler-server
+
# Turn off proxies.
unset http_proxy
unset https_proxy
diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index a56d358ea..f6918fa76 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -3426,3 +3426,130 @@ OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d
/connection dropped.*/d"])
AT_CLEANUP
+
+AT_SETUP([ovn -- IPv6 prefix delegation])
+AT_SKIP_IF([test $HAVE_DIBBLER_SERVER = no])
+AT_KEYWORDS([ovn-ipv6-prefix_d])
+
+ovn_start
+OVS_TRAFFIC_VSWITCHD_START()
+
+ADD_BR([br-int])
+ADD_BR([br-ext])
+
+ovs-ofctl add-flow br-ext action=normal
+# 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
+
+ovn-nbctl lr-add R1
+
+ovn-nbctl ls-add sw0
+ovn-nbctl ls-add sw1
+ovn-nbctl ls-add public
+
+ovn-nbctl lrp-add R1 rp-sw0 00:00:01:01:02:03 192.168.1.1/24
+ovn-nbctl lrp-add R1 rp-sw1 00:00:03:01:02:03 192.168.2.1/24
+ovn-nbctl lrp-add R1 rp-public 00:00:02:01:02:03 172.16.1.1/24 2001:db8:3333::1/64 \
+ -- set Logical_Router_Port rp-public options:redirect-chassis=hv1
+
+ovn-nbctl lsp-add sw0 sw0-rp -- set Logical_Switch_Port sw0-rp \
+ type=router options:router-port=rp-sw0 \
+ -- lsp-set-addresses sw0-rp router
+ovn-nbctl lsp-add sw1 sw1-rp -- set Logical_Switch_Port sw1-rp \
+ type=router options:router-port=rp-sw1 \
+ -- lsp-set-addresses sw1-rp router
+
+ovn-nbctl lsp-add public public-rp -- set Logical_Switch_Port public-rp \
+ type=router options:router-port=rp-public \
+ -- lsp-set-addresses public-rp router
+
+ADD_NAMESPACES(sw01)
+ADD_VETH(sw01, sw01, br-int, "192.168.1.2/24", "f0:00:00:01:02:03", \
+ "192.168.1.1")
+ovn-nbctl lsp-add sw0 sw01 \
+ -- lsp-set-addresses sw01 "f0:00:00:01:02:03 192.168.1.2"
+
+ADD_NAMESPACES(sw11)
+ADD_VETH(sw11, sw11, br-int, "192.168.2.2/24", "f0:00:00:02:02:03", \
+ "192.168.2.1")
+ovn-nbctl lsp-add sw1 sw11 \
+ -- lsp-set-addresses sw11 "f0:00:00:02:02:03 192.168.2.2"
+
+ADD_NAMESPACES(server)
+ADD_VETH(s1, server, br-ext, "2001:db8:3333::2/64", "f0:00:00:01:02:05", \
+ "2001:db8:3333::1")
+
+OVS_WAIT_UNTIL([test "$(ip netns exec server ip a | grep 2001:db8:3333::2 | grep tentative)" = ""])
+OVS_WAIT_UNTIL([test "$(ip netns exec server ip a | grep fe80 | grep tentative)" = ""])
+
+AT_CHECK([ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings=phynet:br-ext])
+ovn-nbctl lsp-add public public1 \
+ -- lsp-set-addresses public1 unknown \
+ -- lsp-set-type public1 localnet \
+ -- lsp-set-options public1 network_name=phynet
+
+ovn-nbctl set logical_router_port rp-public options:prefix_delegation=true
+ovn-nbctl set logical_router_port rp-public options:prefix=true
+ovn-nbctl set logical_router_port rp-sw0 options:prefix=true
+ovn-nbctl set logical_router_port rp-sw1 options:prefix=true
+
+# reset dibbler state
+sed s/eth0/s1/g -i /etc/dibbler/server.conf
+cat > /var/lib/dibbler/server-AddrMgr.xml <
+ 1575481348
+ 0
+
+EOF
+cat > /var/lib/dibbler/server-CfgMgr.xml <
+ /var/lib/dibbler
+ Server
+ 8
+ 0
+ 0
+
+EOF
+
+NS_CHECK_EXEC([server], [dibbler-server run > dibbler.log &])
+ovn-nbctl --wait=hv sync
+
+sleep 10
+kill $(pidof dibbler-server)
+
+OVS_WAIT_UNTIL([ovn-sbctl list port_binding rp-public | grep ipv6_ra_pd_list])
+OVS_WAIT_UNTIL([ovn-sbctl list port_binding rp-sw0 | grep ipv6_ra_pd_list])
+OVS_WAIT_UNTIL([ovn-sbctl list port_binding rp-sw1 | grep ipv6_ra_pd_list])
+AT_CHECK([ovn-sbctl get port_binding rp-public options:ipv6_ra_pd_list], [0], [dnl
+"2001:db8:3333::6a2f:0:0/96"
+])
+AT_CHECK([ovn-sbctl get port_binding rp-sw0 options:ipv6_ra_pd_list], [0], [dnl
+"2001:db8:3333::5b81:0:0/96"
+])
+AT_CHECK([ovn-sbctl get port_binding rp-sw1 options:ipv6_ra_pd_list], [0], [dnl
+"2001:db8:3333::42f1:0:0/96"
+])
+
+kill $(pidof 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([ovn-northd])
+
+as
+OVS_TRAFFIC_VSWITCHD_STOP(["/.*error receiving.*/d
+/.*terminating with signal 15.*/d"])
+AT_CLEANUP