From patchwork Wed Dec 12 23:06:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1012403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43FXX01jBGz9s7T for ; Thu, 13 Dec 2018 10:07:27 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id CFF50BAF; Wed, 12 Dec 2018 23:07:24 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D9390B12 for ; Wed, 12 Dec 2018 23:07:22 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 01CAA71C for ; Wed, 12 Dec 2018 23:07:21 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id 96so114792wrb.2 for ; Wed, 12 Dec 2018 15:07:21 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IMD1uDjPXSFn2CqaBNVTUhOLiqAF/sv08ErolFSIKn8=; b=QUfJj2wWcdUZxUujj4XajFmhphkjHDVohGbj1NhptX6kEcPp/rzvEInZ7uDJrT2mab du91HBq9Y2Wg5ypNTEaUXuig9ErlFnXdXpB/MXbrbiI7VuqMk4CbshnqzpYz/Yd3HnN4 QfGIuo3/ikRBdjNLuUFiA38PhfYBrbZZABL/meG8po9qtzSi3rEMX0iRe0lcNIF15fFK XbTyELynqrB0aYuHQf85oPOFP7nCmUSwjruT2arxId3Oj7IFpJjRFv7s9xHtAOakU3Uz FAZX9jBCwUXHDvPjjz/AtmOFmnI1ztciIfKIo611ldOc8FUq6ql385hoRVlGrz5+jHg5 zGXw== X-Gm-Message-State: AA+aEWYrTpFg5iSoj4YFhT1iYexg4TQY01ICvpTZDGErIN72gim2Nsyi zWxrCektsI12Vodhc78rM5TVAEFfJQo= X-Google-Smtp-Source: AFSGD/WxdGCFeSNtrStaWhkj1pTQAYi8MRoS2wzTswZpAAsa+WLXrUAwkuivKQv8tl07E/3Bjdq6iQ== X-Received: by 2002:adf:e78f:: with SMTP id n15mr19598622wrm.115.1544656040089; Wed, 12 Dec 2018 15:07:20 -0800 (PST) Received: from localhost.localdomain.com ([151.66.36.11]) by smtp.gmail.com with ESMTPSA id e19sm235183wrc.25.2018.12.12.15.07.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Dec 2018 15:07:19 -0800 (PST) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Date: Thu, 13 Dec 2018 00:06:58 +0100 Message-Id: <140119565782e94b546559fc632a9815733b7adf.1544655796.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2] OVN: add mac address only support to IPAM/MACAM X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Add the capability to assign just L2 address to IPAM/MACAM since in the current implementation either subnet or ipv6_prefix are mandatory to enable IPAM Tested-by: Yossi Segev Signed-off-by: Lorenzo Bianconi Acked-by: Mark Michelson --- Changes since v1: - fix documentation --- ovn/northd/ovn-northd.c | 8 +++++++- ovn/ovn-nb.xml | 5 +++++ tests/ovn.at | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index e1fbf60f3..0284b3796 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -414,6 +414,7 @@ struct ipam_info { unsigned long *allocated_ipv4s; /* A bitmap of allocated IPv4s */ bool ipv6_prefix_set; struct in6_addr ipv6_prefix; + bool mac_only; }; /* The 'key' comes from nbs->header_.uuid or nbr->header_.uuid or @@ -559,6 +560,10 @@ init_ipam_info_for_datapath(struct ovn_datapath *od) } if (!subnet_str) { + if (!ipv6_prefix) { + od->ipam_info.mac_only = smap_get_bool(&od->nbs->other_config, + "mac_only", false); + } return; } @@ -1382,7 +1387,8 @@ build_ipam(struct hmap *datapaths, struct hmap *ports) const struct nbrec_logical_switch_port *nbsp = od->nbs->ports[i]; if (!od->ipam_info.allocated_ipv4s && - !od->ipam_info.ipv6_prefix_set) { + !od->ipam_info.ipv6_prefix_set && + !od->ipam_info.mac_only) { if (nbsp->dynamic_addresses) { nbrec_logical_switch_port_set_dynamic_addresses(nbsp, NULL); diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml index 4141751f8..6d6fb055a 100644 --- a/ovn/ovn-nb.xml +++ b/ovn/ovn-nb.xml @@ -267,6 +267,11 @@
  • 8230:5678::
    • + + + Value used to request to assign L2 address only if neither subnet + nor ipv6_prefix are specified + diff --git a/tests/ovn.at b/tests/ovn.at index afefb8ad6..85fb81d46 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -5754,6 +5754,23 @@ AT_CHECK([test "$p71_addr" != "$p72_addr"], [0], []) AT_CHECK([test "$p71_addr" != "$p73_addr"], [0], []) AT_CHECK([test "$p72_addr" != "$p73_addr"], [0], []) +# request to assign mac only +# +ovn-nbctl ls-add sw8 +ovn-nbctl --wait=sb set Logical-Switch sw8 other_config:mac_only=true +for n in $(seq 1 3); do + ovn-nbctl --wait=sb lsp-add sw8 "p8$n" -- lsp-set-addresses "p8$n" dynamic +done +AT_CHECK([ovn-nbctl get Logical-Switch-Port p81 dynamic_addresses], [0], + ["00:11:22:00:00:06" +]) +AT_CHECK([ovn-nbctl get Logical-Switch-Port p82 dynamic_addresses], [0], + ["00:11:22:00:00:07" +]) +AT_CHECK([ovn-nbctl get Logical-Switch-Port p83 dynamic_addresses], [0], + ["00:11:22:00:00:08" +]) + as ovn-sb OVS_APP_EXIT_AND_WAIT([ovsdb-server])