From patchwork Fri Dec 28 17:38:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1019219 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 43RDTs1Pydz9s8J for ; Sat, 29 Dec 2018 04:39:12 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D53F7BA4; Fri, 28 Dec 2018 17:39:09 +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 22F09B79 for ; Fri, 28 Dec 2018 17:39:08 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1C9FA2D5 for ; Fri, 28 Dec 2018 17:39:07 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id y139so19311112wmc.5 for ; Fri, 28 Dec 2018 09:39:06 -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=aKXNd3EkDd1fbkChBFz80/jgvJCYEe6fxudZ6H1+CUM=; b=jzXH+HkdzdrK3yrupx7HSiIFFAM0Eb8M+cysAVWnbsNIkMY5xd42I+/CBAP0J9FdCZ pnYmZD+bCMj9xo/BOw4YM5dQmu4Z8P6Pwjgu3COn6dwYINzoL01YEwK6b82e0B25wLBP Ly7NIrNUyb8+WNl8yZnKdFLlc90gZCLuOYuAaeg6BN1u7EunD3fzd5z+vqYlVTByZolQ 309inoGjIQol0vLLfkDNVrAX9UNoKTRdH5UrxAA8laSUNhRXY3B+Y/sVa5iuTpKf/egk baRZTEddEYJs/4DE7J5u2OgnSZ+rII7R6bOto0gindM1Yws7M75NsBfnRytJU5RX1G0W ZGuQ== X-Gm-Message-State: AJcUukdR3Okmf2+frZj/SctV9hKwZ1A2jLbm3RFXNeCQRDYFGPZARghf gqMrGvC4R1ewdFp70JumsD2HoR/96mA= X-Google-Smtp-Source: ALg8bN7GNGWCVfRkxNEixsG1Prd7NDU+SCMKTb243cEFi6nZbqppsS5lmsYTMkXmQefalSE8IHvAOA== X-Received: by 2002:a1c:cbcb:: with SMTP id b194mr22657268wmg.64.1546018745301; Fri, 28 Dec 2018 09:39:05 -0800 (PST) Received: from localhost.net (host10-126-dynamic.18-79-r.retail.telecomitalia.it. [79.18.126.10]) by smtp.gmail.com with ESMTPSA id e16sm31965812wrn.72.2018.12.28.09.39.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Dec 2018 09:39:04 -0800 (PST) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Date: Fri, 28 Dec 2018 18:38:47 +0100 Message-Id: <290a6b8c4d8049ddaba9ced057436e8a2fd901b8.1546018243.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.20.1 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 v3] OVN: add static IP support to IPAM 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 IPAM/MACAM framework to specify a static ip address and get the L2 one allocated dynamically using the following syntax: $ovn-nbctl lsp-set-addresses "dynamic " The static ip address needs to belong to the subnet configured for the logical switch Signed-off-by: Lorenzo Bianconi --- Changes since v2: - add a NEWS item - this patch is based on "OVN: add mac address only support to IPAM/MACAM" https://patchwork.ozlabs.org/patch/1019217/ Changes since v1: - use syntax "dynamic " to configure the static ip address --- NEWS | 6 +++++- ovn/lib/ovn-util.c | 8 ++++++++ ovn/northd/ovn-northd.c | 37 +++++++++++++++++++++++++++++++++---- ovn/utilities/ovn-nbctl.c | 5 ++++- tests/ovn.at | 12 ++++++++++++ 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 9de87a736..2de844f30 100644 --- a/NEWS +++ b/NEWS @@ -14,7 +14,11 @@ Post-v2.10.0 version. * New support for IPSEC encrypted tunnels between hypervisors. * ovn-ctl: allow passing user:group ids to the OVN daemons. - * IPAM/MACAM: add the capability to dynamically assign just L2 addresses + * IPAM/MACAM: + - add the capability to dynamically assign just L2 addresses + - add the capability to specify a static ip address and get the L2 one + allocated dynamically using the following syntax: + ovn-nbctl lsp-set-addresses "dynamic " - DPDK: * Add option for simple round-robin based Rxq to PMD assignment. It can be set with pmd-rxq-assign. diff --git a/ovn/lib/ovn-util.c b/ovn/lib/ovn-util.c index e9464e926..aa03919bb 100644 --- a/ovn/lib/ovn-util.c +++ b/ovn/lib/ovn-util.c @@ -72,13 +72,21 @@ add_ipv6_netaddr(struct lport_addresses *laddrs, struct in6_addr addr, * "xx:xx:xx:xx:xx:xx dynamic": * Use specified MAC address, but allocate an IP address * dynamically. + * + * "dynamic x.x.x.x": + * Use specified IP address, but allocate a MAC address + * dynamically. */ bool is_dynamic_lsp_address(const char *address) { struct eth_addr ea; + ovs_be32 ip; int n; return (!strcmp(address, "dynamic") + || (ovs_scan(address, "dynamic "IP_SCAN_FMT"%n", + IP_SCAN_ARGS(&ip), &n) + && address[n] == '\0') || (ovs_scan(address, ETH_ADDR_SCAN_FMT" dynamic%n", ETH_ADDR_SCAN_ARGS(ea), &n) && address[n] == '\0')); } diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index c0b56c4c2..3fd8a8757 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -1109,6 +1109,7 @@ struct dynamic_address_update { struct lport_addresses current_addresses; struct eth_addr static_mac; + ovs_be32 static_ip; enum dynamic_update_type mac; enum dynamic_update_type ipv4; enum dynamic_update_type ipv6; @@ -1147,7 +1148,8 @@ dynamic_mac_changed(const char *lsp_addresses, } static enum dynamic_update_type -dynamic_ip4_changed(struct dynamic_address_update *update) +dynamic_ip4_changed(const char *lsp_addrs, + struct dynamic_address_update *update) { const struct ipam_info *ipam = &update->op->od->ipam_info; const struct lport_addresses *cur_addresses = &update->current_addresses; @@ -1180,6 +1182,25 @@ dynamic_ip4_changed(struct dynamic_address_update *update) */ return DYNAMIC; } else { + ovs_be32 new_ip; + int n = 0; + + if (ovs_scan(lsp_addrs, "dynamic "IP_SCAN_FMT"%n", + IP_SCAN_ARGS(&new_ip), &n) + && lsp_addrs[n] == '\0') { + + index = ntohl(new_ip) - ipam->start_ipv4; + if (ntohl(new_ip) < ipam->start_ipv4 || + index > ipam->total_ipv4s || + bitmap_is_set(ipam->allocated_ipv4s, index)) { + /* new static ip is not valid */ + return DYNAMIC; + } else if (cur_addresses->ipv4_addrs[0].addr != new_ip) { + update->ipv4 = STATIC; + update->static_ip = new_ip; + return STATIC; + } + } return NONE; } } @@ -1231,7 +1252,7 @@ dynamic_addresses_check_for_updates(const char *lsp_addrs, struct dynamic_address_update *update) { update->mac = dynamic_mac_changed(lsp_addrs, update); - update->ipv4 = dynamic_ip4_changed(update); + update->ipv4 = dynamic_ip4_changed(lsp_addrs, update); update->ipv6 = dynamic_ip6_changed(update); if (update->mac == NONE && update->ipv4 == NONE && @@ -1274,6 +1295,7 @@ set_dynamic_updates(const char *addrspec, struct dynamic_address_update *update) { struct eth_addr mac; + ovs_be32 ip; int n = 0; if (ovs_scan(addrspec, ETH_ADDR_SCAN_FMT" dynamic%n", ETH_ADDR_SCAN_ARGS(mac), &n) @@ -1283,7 +1305,13 @@ set_dynamic_updates(const char *addrspec, } else { update->mac = DYNAMIC; } - if (update->op->od->ipam_info.allocated_ipv4s) { + + if (ovs_scan(addrspec, "dynamic "IP_SCAN_FMT"%n", + IP_SCAN_ARGS(&ip), &n) + && addrspec[n] == '\0') { + update->ipv4 = STATIC; + update->static_ip = ip; + } else if (update->op->od->ipam_info.allocated_ipv4s) { update->ipv4 = DYNAMIC; } else { update->ipv4 = NONE; @@ -1308,7 +1336,8 @@ update_dynamic_addresses(struct dynamic_address_update *update) case REMOVE: break; case STATIC: - OVS_NOT_REACHED(); + ip4 = update->static_ip; + break; case DYNAMIC: ip4 = htonl(ipam_get_unused_ip(update->od)); } diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index 9d1b22089..2fa0b3389 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -1529,11 +1529,14 @@ nbctl_lsp_set_addresses(struct ctl_context *ctx) int i; for (i = 2; i < ctx->argc; i++) { struct eth_addr ea; + ovs_be32 ip; if (strcmp(ctx->argv[i], "unknown") && strcmp(ctx->argv[i], "dynamic") && strcmp(ctx->argv[i], "router") && !ovs_scan(ctx->argv[i], ETH_ADDR_SCAN_FMT, - ETH_ADDR_SCAN_ARGS(ea))) { + ETH_ADDR_SCAN_ARGS(ea)) + && !ovs_scan(ctx->argv[i], "dynamic "IP_SCAN_FMT, + IP_SCAN_ARGS(&ip))) { ctl_error(ctx, "%s: Invalid address format. See ovn-nb(5). " "Hint: An Ethernet address must be " "listed before an IP address, together as a single " diff --git a/tests/ovn.at b/tests/ovn.at index 5490fcd9c..8bada3241 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -5724,6 +5724,18 @@ AT_CHECK([ovn-nbctl get Logical-Switch-Port p41 dynamic_addresses], [0], ["f0:00:00:00:10:2b 192.168.1.3" ]) +# Add static ip address +ovn-nbctl --wait=sb lsp-set-addresses p41 "dynamic 192.168.1.100" +ovn-nbctl list Logical-Switch-Port p41 +ovn-nbctl --wait=sb lsp-add sw5 p42 -- lsp-set-addresses p42 \ +"dynamic 192.168.1.101" +AT_CHECK([ovn-nbctl get Logical-Switch-Port p41 dynamic_addresses], [0], + ["0a:00:00:a8:01:65 192.168.1.100" +]) +AT_CHECK([ovn-nbctl get Logical-Switch-Port p42 dynamic_addresses], [0], + ["0a:00:00:a8:01:66 192.168.1.101" +]) + # define a mac address prefix ovn-nbctl ls-add sw6 ovn-nbctl --wait=hv set NB_Global . options:mac_prefix="00:11:22:33:44:55"