From patchwork Wed May 10 14:21:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1779535 X-Patchwork-Delegate: nusiddiq@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.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=jNi9rBZn; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QGcgj1xVsz214M for ; Thu, 11 May 2023 00:22:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 6E3FB429FC; Wed, 10 May 2023 14:22:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6E3FB429FC Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=jNi9rBZn X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MsBJCrN4viK6; Wed, 10 May 2023 14:22:53 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2C82142C0C; Wed, 10 May 2023 14:22:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2C82142C0C Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6F12FC0093; Wed, 10 May 2023 14:22:51 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1AECFC0094 for ; Wed, 10 May 2023 14:22:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4EE856FEAA for ; Wed, 10 May 2023 14:22:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4EE856FEAA Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=jNi9rBZn X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DAE99unnix47 for ; Wed, 10 May 2023 14:22:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 34D546FE9C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 34D546FE9C for ; Wed, 10 May 2023 14:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683728532; 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=LurMbk56gWD1T5AX4EMn/ukqmcCgSQ6rs+cxGzJsQaw=; b=jNi9rBZnqUEjfzz1FmlRFX/JOGsRBQ6dtoZBTKPhf0l8dYwNAQdf8IoEOTw3RiZpweJPmT 4AlS7bapbEX3raugDAxtNK4EsGzydUAYYA/XudvK2gEjEy9LwmGHpvX4A7PQdFzZtiAsOl agwCbqGgydIvXL5SJOX+vGI1Y3pMrHk= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-513-gZtsJbnUNO-chrXq8k845g-1; Wed, 10 May 2023 10:22:08 -0400 X-MC-Unique: gZtsJbnUNO-chrXq8k845g-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3f420742d40so16897725e9.2 for ; Wed, 10 May 2023 07:22:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683728525; x=1686320525; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LurMbk56gWD1T5AX4EMn/ukqmcCgSQ6rs+cxGzJsQaw=; b=I69trPPRbdLTbfYVke6vc41/GTyYmfB+bT8OnbsiG6WCMITvOt+kUzoDzsON3cf8aw m9gL5BQIZDbTuYkKIGo6/ZfLYEXRLUabc2PYsV05Q0ODvcOTESEX1NUlnKA44oSVlSns wXDCDZqd0EqkD5wyIxStL3AUWLwDmrZK3NgG82TTd64jTM3I6pYj0xoOrJhaitkwXUWK xWHqG4XCUPR4NL0K0zq1AN/LWuMtSpNSbN0+3npqs8HD2czLLsxubwJPofhAS7T338Yk bgYFTiVrukyU8bUl/cb1aWnBddWAelUTYpz92g8tHWs0wx/0sXXRDmt4oufASOWC7Lm5 R34A== X-Gm-Message-State: AC+VfDywg2/XS112FkJ3ib46Llv2BcDurX43Z1E1Go2yH6qltkbtX/Zs uw5V5fWPKs/9VJkls6xi1cRKyb89J1a6o66yKzh//LHUaE82P0z9AmQIlVbIPimG9BuKJePvJML IYuxZV3dmAJr9WE/Elf4v6qk4W+Spov/bgtL1KHVIjXBalQ2GXbSgem/cDJNclq+dUe++5Sza2B FJk/igLEoaEXst X-Received: by 2002:a05:600c:ad8:b0:3f1:95ea:9342 with SMTP id c24-20020a05600c0ad800b003f195ea9342mr12532106wmr.0.1683728525341; Wed, 10 May 2023 07:22:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4OHYjy5tbGohKsIBZYXsdKyhUp96mTGjwGgagKIxuHjwEsgwr4PqUOMiwHtct0mjcFnZilNw== X-Received: by 2002:a05:600c:ad8:b0:3f1:95ea:9342 with SMTP id c24-20020a05600c0ad800b003f195ea9342mr12532076wmr.0.1683728524885; Wed, 10 May 2023 07:22:04 -0700 (PDT) Received: from localhost (net-130-25-106-149.cust.vodafonedsl.it. [130.25.106.149]) by smtp.gmail.com with ESMTPSA id z24-20020a1cf418000000b003f3e50eb606sm22712214wma.13.2023.05.10.07.22.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 07:22:04 -0700 (PDT) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Date: Wed, 10 May 2023 16:21:29 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: dceara@redhat.com, simon.horman@corigine.com, i.maximets@ovn.org, ralonsoh@redhat.com Subject: [ovs-dev] [PATCH v6 ovn 7/9] northd: apply QoS rules on the localnet port related to LSP ports 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" This patch allows to apply QoS rules on the localnet port related to logical switch ports running on the same datapath. Considering the following netowrk configuration: LSP{0,1} -- LogicalSwitch -- Localnet0 It is possible to apply the following QoS rules on Localnet0 on egress traffic entering the cluster from LSP{0,1}: - LSP0: min-rate r0, max_rate R0 - LSP1: min-rate r1, max_rate R1 Acked-By: Ihar Hrachyshka Tested-by: Rodolfo Alonso Signed-off-by: Lorenzo Bianconi --- controller/binding.c | 6 +-- northd/northd.c | 26 +++++++--- northd/ovn-northd.8.xml | 12 +++++ tests/ovn-northd.at | 2 + tests/ovn-performance.at | 5 -- tests/ovn.at | 101 +++++++++++++++++++++++++++++++++++++++ tests/system-ovn.at | 86 ++++++++++++++++++++++++++++++++- 7 files changed, 222 insertions(+), 16 deletions(-) diff --git a/controller/binding.c b/controller/binding.c index 5502fcdeb..5ae5d4c1e 100644 --- a/controller/binding.c +++ b/controller/binding.c @@ -286,9 +286,9 @@ get_qos_egress_port_interface(struct shash *bridge_mappings, continue; } - bool is_egress_iface = smap_get_bool(&iface->external_ids, - "ovn-egress-iface", false); - if (is_egress_iface) { + if (smap_get_bool(&iface->external_ids, + "ovn-egress-iface", false) || + !strcmp(iface->type, "")) { *pport = port; return iface; } diff --git a/northd/northd.c b/northd/northd.c index 53217347d..80aad25a0 100644 --- a/northd/northd.c +++ b/northd/northd.c @@ -5784,15 +5784,29 @@ build_lswitch_port_sec_op(struct ovn_port *op, struct hmap *lflows, ds_cstr(match), ds_cstr(actions), op->key, &op->nbsp->header_); + if (!lsp_is_localnet(op->nbsp) && !op->od->n_localnet_ports) { + return; + } + + ds_clear(actions); + ds_put_format(actions, "set_queue(%s); output;", queue_id); + + ds_clear(match); if (lsp_is_localnet(op->nbsp)) { - ds_clear(match); - ds_clear(actions); ds_put_format(match, "outport == %s", op->json_key); - ds_put_format(actions, "set_queue(%s); output;", queue_id); ovn_lflow_add_with_lport_and_hint(lflows, op->od, - S_SWITCH_OUT_APPLY_PORT_SEC, 100, - ds_cstr(match), ds_cstr(actions), - op->key, &op->nbsp->header_); + S_SWITCH_OUT_APPLY_PORT_SEC, 100, + ds_cstr(match), ds_cstr(actions), + op->key, &op->nbsp->header_); + } else if (op->od->n_localnet_ports) { + ds_put_format(match, "outport == %s && inport == %s", + op->od->localnet_ports[0]->json_key, + op->json_key); + ovn_lflow_add_with_lport_and_hint(lflows, op->od, + S_SWITCH_OUT_APPLY_PORT_SEC, 110, + ds_cstr(match), ds_cstr(actions), + op->od->localnet_ports[0]->key, + &op->od->localnet_ports[0]->nbsp->header_); } } } diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml index 70153dc9e..7da912da3 100644 --- a/northd/ovn-northd.8.xml +++ b/northd/ovn-northd.8.xml @@ -2223,6 +2223,18 @@ output;

    +
  • +

    + For each port configured with egress qos in the + column of , running a localnet port on the same logical + switch, a priority 110 flow is added which matches on the localnet + outport and on the port inport and + applies the action set_queue(id); output;". +

    +
    • +

  • For each localnet port configured with egress qos in the diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 047b8b6ad..8005c09b8 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -8065,6 +8065,7 @@ sort | sed 's/table=../table=??/' ], [0], [dnl table=??(ls_out_check_port_sec), priority=0 , match=(1), action=(reg0[[15]] = check_out_port_sec(); next;) table=??(ls_out_check_port_sec), priority=100 , match=(eth.mcast), action=(reg0[[15]] = 0; next;) table=??(ls_out_apply_port_sec), priority=0 , match=(1), action=(output;) + table=??(ls_out_apply_port_sec), priority=110 , match=(outport == "localnetport" && inport == "sw0p2"), action=(set_queue(10); output;) table=??(ls_out_apply_port_sec), priority=50 , match=(reg0[[15]] == 1), action=(drop;) ]) @@ -8095,6 +8096,7 @@ sort | sed 's/table=../table=??/' ], [0], [dnl table=??(ls_out_check_port_sec), priority=100 , match=(eth.mcast), action=(reg0[[15]] = 0; next;) table=??(ls_out_apply_port_sec), priority=0 , match=(1), action=(output;) table=??(ls_out_apply_port_sec), priority=100 , match=(outport == "localnetport"), action=(set_queue(10); output;) + table=??(ls_out_apply_port_sec), priority=110 , match=(outport == "localnetport" && inport == "sw0p2"), action=(set_queue(10); output;) table=??(ls_out_apply_port_sec), priority=50 , match=(reg0[[15]] == 1), action=(drop;) ]) diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at index 8ac0a392c..ba329f0f6 100644 --- a/tests/ovn-performance.at +++ b/tests/ovn-performance.at @@ -559,11 +559,6 @@ OVN_CONTROLLER_EXPECT_NO_HIT( [ovn-nbctl --wait=hv set Logical_Switch_Port ln-public options:qos_burst=1000] ) -OVN_CONTROLLER_EXPECT_HIT( - [hv3], [lflow_run], - [as hv3 ovs-vsctl set interface vgw3 external-ids:ovn-egress-iface=true] -) - ovn-nbctl --wait=hv meter-add meter0 drop 100 pktps 10 OVN_CONTROLLER_EXPECT_NO_HIT( diff --git a/tests/ovn.at b/tests/ovn.at index 31f8d34d8..8501bbc28 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -35557,3 +35557,104 @@ check test "$current_id2" = "$prev_id2" OVN_CLEANUP([hv1]) AT_CLEANUP ]) + +OVN_FOR_EACH_NORTHD([ +AT_SETUP([OVN QoS]) +ovn_start + +check ovn-nbctl ls-add ls +check ovn-nbctl lsp-add ls public +check ovn-nbctl lsp-set-addresses public unknown +check ovn-nbctl lsp-set-type public localnet +check ovn-nbctl lsp-set-options public network_name=phys +net_add n + +# two hypervisors, each connected to the same network +for i in 1 2; do + sim_add hv-$i + as hv-$i + ovs-vsctl add-br br-phys + ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys + ovn_attach n br-phys 192.168.0.$i +done + +for i in 1 2; do + check ovn-nbctl lsp-add ls lsp$i + check ovn-nbctl lsp-set-addresses lsp$i f0:00:00:00:00:0$i +done + +for i in 1 2; do + as hv-$i + ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lsp$i \ + ofport-request=$i + OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp$i` = xup]) + + # Patch port might be created after ports are reported up + # Wait for a flow outputing to patch port + OVN_WAIT_PATCH_PORT_FLOWS(["public"], ["hv-$i"]) +done + +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp1 options:qos_min_rate=200000 +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp1 options:qos_max_rate=350000 +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp1 options:qos_burst=3000000 + +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list qos | grep -c linux-htb) -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'min-rate="200000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'max-rate="350000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'burst="3000000"') -eq 1]) + +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp2 options:qos_min_rate=400000 +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp2 options:qos_max_rate=500000 +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp2 options:qos_burst=3000000 + +OVS_WAIT_UNTIL([test $(as hv-2 ovs-vsctl list qos | grep -c linux-htb) -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-2 ovs-vsctl list queue | grep -c 'min-rate="400000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-2 ovs-vsctl list queue | grep -c 'max-rate="500000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-2 ovs-vsctl list queue | grep -c 'burst="3000000"') -eq 1]) + +check ovn-nbctl lsp-add ls lsp3 +check ovn-nbctl lsp-set-addresses lsp3 f0:00:00:00:00:03 +as hv-1 +ovs-vsctl add-port br-int vif3 -- \ + set Interface vif3 external-ids:iface-id=lsp3 \ + ofport-request=3 +OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp3` = xup]) + +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp3 options:qos_min_rate=700000 +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp3 options:qos_max_rate=800000 +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp3 options:qos_burst=9000000 + +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list qos | grep -c linux-htb) -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'min-rate="200000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'max-rate="350000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'burst="3000000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'min-rate="700000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'max-rate="800000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'burst="9000000"') -eq 1]) + +check ovn-nbctl --wait=hv remove Logical_Switch_Port lsp3 options qos_min_rate=700000 +check ovn-nbctl --wait=hv remove Logical_Switch_Port lsp3 options qos_max_rate=800000 +check ovn-nbctl --wait=hv remove Logical_Switch_Port lsp3 options qos_burst=9000000 + +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list qos | grep -c linux-htb) -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'min-rate="200000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'max-rate="350000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'burst="3000000"') -eq 1]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'min-rate="700000"') -eq 0]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'max-rate="800000"') -eq 0]) +OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'burst="9000000"') -eq 0]) + +check ovn-nbctl --wait=hv set Logical_Switch_Port lsp2 options:qos_min_rate=410000 +OVS_WAIT_UNTIL([test $(as hv-2 ovs-vsctl list queue | grep -c 'min-rate="410000"') -eq 1]) + +check ovn-nbctl --wait=hv remove Logical_Switch_Port lsp2 options qos_min_rate=410000 +check ovn-nbctl --wait=hv remove Logical_Switch_Port lsp2 options qos_max_rate=500000 +check ovn-nbctl --wait=hv remove Logical_Switch_Port lsp2 options qos_burst=3000000 + +OVS_WAIT_UNTIL([test $(as hv-2 ovs-vsctl list qos | grep -c linux-htb) -eq 0]) +OVS_WAIT_UNTIL([test $(as hv-2 ovs-vsctl list queue | grep -c 'min-rate="410000"') -eq 0]) +OVS_WAIT_UNTIL([test $(as hv-2 ovs-vsctl list queue | grep -c 'max-rate="500000"') -eq 0]) +OVS_WAIT_UNTIL([test $(as hv-2 ovs-vsctl list queue | grep -c 'burst="3000000"') -eq 0]) + +AT_CLEANUP +]) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index a4387349c..8fe8e4d28 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -6553,6 +6553,11 @@ ADD_VETH(sw01, sw01, br-int, "192.168.1.2/24", "f0:00:00:01:02:03") ovn-nbctl lsp-add sw0 sw01 \ -- lsp-set-addresses sw01 "f0:00:00:01:02:03 192.168.1.2" +ADD_NAMESPACES(sw02) +ADD_VETH(sw02, sw02, br-int, "192.168.1.3/24", "f0:00:00:01:02:44") +ovn-nbctl lsp-add sw0 sw02 \ + -- lsp-set-addresses sw02 "f0:00:00:01:02:44 192.168.1.3" + ovn-nbctl ls-add sw1 ADD_NAMESPACES(sw11) @@ -6560,6 +6565,11 @@ ADD_VETH(sw11, sw11, br-int, "192.168.4.2/24", "f0:00:00:01:04:03") ovn-nbctl lsp-add sw1 sw11 \ -- lsp-set-addresses sw11 "f0:00:00:01:04:03 192.168.4.2" +ADD_NAMESPACES(sw12) +ADD_VETH(sw12, sw12, br-int, "192.168.4.3/24", "f0:00:00:03:04:03") +ovn-nbctl lsp-add sw1 sw12 \ + -- lsp-set-addresses sw11 "f0:00:00:03:04:03 192.168.4.3" + ADD_NAMESPACES(public) ADD_VETH(public, public, br-public, "192.168.2.2/24", "f0:00:00:01:02:05") AT_CHECK([ovs-vsctl remove interface ovs-public external-ids iface-id=public]) @@ -6582,12 +6592,10 @@ ovn-nbctl lsp-add sw1 ext \ AT_CHECK([ovn-nbctl set Logical_Switch_Port public options:qos_min_rate=200000]) AT_CHECK([ovn-nbctl set Logical_Switch_Port public options:qos_max_rate=300000]) AT_CHECK([ovn-nbctl set Logical_Switch_Port public options:qos_burst=3000000]) -AT_CHECK([ovs-vsctl set interface ovs-public external-ids:ovn-egress-iface=true]) AT_CHECK([ovn-nbctl set Logical_Switch_Port ext options:qos_min_rate=400000]) AT_CHECK([ovn-nbctl set Logical_Switch_Port ext options:qos_max_rate=600000]) AT_CHECK([ovn-nbctl set Logical_Switch_Port ext options:qos_burst=6000000]) -AT_CHECK([ovs-vsctl set interface ovs-ext external-ids:ovn-egress-iface=true]) OVS_WAIT_UNTIL([tc qdisc show | grep -q 'htb 1: dev ovs-public']) OVS_WAIT_UNTIL([tc class show dev ovs-public | \ @@ -6634,6 +6642,80 @@ AT_CHECK([ovn-nbctl remove Logical_Switch_Port public options qos_burst=6000000] OVS_WAIT_UNTIL([test "$(tc qdisc show | grep 'htb 1: dev ovs-public')" = ""]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw01 options:qos_min_rate=200000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw01 options:qos_max_rate=350000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw01 options:qos_burst=3000000]) + +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw11 options:qos_min_rate=400000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw11 options:qos_max_rate=700000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw11 options:qos_burst=6000000]) + +OVS_WAIT_UNTIL([tc qdisc show | grep -q 'htb 1: dev ovs-public']) +OVS_WAIT_UNTIL([tc class show dev ovs-public | \ + grep -q 'class htb .* rate 200Kbit ceil 350Kbit burst 375000b cburst 374999b']) + +OVS_WAIT_UNTIL([tc qdisc show | grep -q 'htb 1: dev ovs-ext']) +OVS_WAIT_UNTIL([tc class show dev ovs-ext | \ + grep -q 'class htb .* prio 0 rate 400Kbit ceil 700Kbit burst 750000b cburst 749999b']) + +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw02 options:qos_min_rate=300000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw02 options:qos_max_rate=500000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw02 options:qos_burst=3000000]) + +OVS_WAIT_UNTIL([tc class show dev ovs-public | \ + grep -q 'class htb .* prio 0 rate 300Kbit ceil 500Kbit burst 375000b cburst 375000b']) + +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw12 options:qos_min_rate=400000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw12 options:qos_max_rate=500000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw12 options:qos_burst=3000000]) + +OVS_WAIT_UNTIL([tc class show dev ovs-ext | \ + grep -q 'class htb .* prio 0 rate 400Kbit ceil 500Kbit burst 375000b cburst 375000b']) + +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw02 options qos_min_rate=300000]) +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw02 options qos_max_rate=500000]) +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw02 options qos_burst=3000000]) + +OVS_WAIT_UNTIL([tc qdisc show | grep -q 'htb 1: dev ovs-public']) +OVS_WAIT_UNTIL([tc class show dev ovs-public | \ + grep -q 'class htb .* rate 200Kbit ceil 350Kbit burst 375000b cburst 374999b']) +OVS_WAIT_UNTIL([test "$(tc class show dev ovs-public | \ + grep 'class htb .* prio 0 rate 300Kbit ceil 500Kbit burst 375000b cburst 375000b')" = ""]) + +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw01 options qos_min_rate=200000]) +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw01 options qos_max_rate=350000]) +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw01 options qos_burst=3000000]) +OVS_WAIT_UNTIL([test "$(tc qdisc show | grep 'htb 1: dev ovs-public')" = ""]) + +OVS_WAIT_UNTIL([tc qdisc show | grep -q 'htb 1: dev ovs-ext']) +OVS_WAIT_UNTIL([tc class show dev ovs-ext | \ + grep -q 'class htb .* prio 0 rate 400Kbit ceil 700Kbit burst 750000b cburst 749999b']) +OVS_WAIT_UNTIL([tc class show dev ovs-ext | \ + grep -q 'class htb .* prio 0 rate 400Kbit ceil 500Kbit burst 375000b cburst 375000b']) + +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw11 options qos_min_rate=400000]) +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw11 options qos_max_rate=700000]) +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw11 options qos_burst=6000000]) + +OVS_WAIT_UNTIL([tc qdisc show | grep -q 'htb 1: dev ovs-ext']) +OVS_WAIT_UNTIL([test "$(tc class show dev ovs-ext | \ + grep 'class htb .* prio 0 rate 400Kbit ceil 700Kbit burst 750000b cburst 749999b')" = ""]) +OVS_WAIT_UNTIL([tc class show dev ovs-ext | \ + grep -q 'class htb .* prio 0 rate 400Kbit ceil 500Kbit burst 375000b cburst 375000b']) + +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw12 options qos_min_rate=400000]) +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw12 options qos_max_rate=500000]) +AT_CHECK([ovn-nbctl remove Logical_Switch_Port sw12 options qos_burst=3000000]) + +OVS_WAIT_UNTIL([test "$(tc qdisc show | grep 'htb 1: dev ovs-ext')" = ""]) + +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw02 options:qos_min_rate=5000000000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw02 options:qos_max_rate=6000000000]) +AT_CHECK([ovn-nbctl set Logical_Switch_Port sw02 options:qos_burst=1000000]) + +OVS_WAIT_UNTIL([tc class show dev ovs-public | \ + grep -q 'class htb .* prio 0 rate 5Gbit ceil 6Gbit burst 125000b cburst 124500b']) + kill $(pidof ovn-controller) as ovn-sb