From patchwork Tue Sep 20 00:04:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ihar Hrachyshka X-Patchwork-Id: 1679822 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=SaGm2S4W; 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 4MWhd60jVQz1yp7 for ; Tue, 20 Sep 2022 10:05:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 55135403BE; Tue, 20 Sep 2022 00:05:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 55135403BE 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=SaGm2S4W 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 xG6VH_slVZw5; Tue, 20 Sep 2022 00:05:09 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8AD044028D; Tue, 20 Sep 2022 00:05:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8AD044028D Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 522F2C0032; Tue, 20 Sep 2022 00:05:08 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id AA12CC0032 for ; Tue, 20 Sep 2022 00:05:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 767BC40291 for ; Tue, 20 Sep 2022 00:05:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 767BC40291 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 T1dRRcRyz_6m for ; Tue, 20 Sep 2022 00:05:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org BEEAE400C5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id BEEAE400C5 for ; Tue, 20 Sep 2022 00:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663632303; 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=J4CnnBYIy/swtG6e3jyh0xpZXkVg62rv3/GbKlfT/Oc=; b=SaGm2S4WHhZeLCFMUY3sC243587ZW8CM7wSa4H9IyMsHfIETipYZHpE5EqcnHgZnaDU5fB jB8hiSyyBpcdQ0ByB8aXNC7T/mdy1ajJTGhZybcLVo0YA8QIy9RVgr3Fr6aXeDV5M4OMly 00xrxZvssUqqbJ2rfDh2BmlHcS9Qko0= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-85-agV3RwgHMHakgQzGUqFSmw-1; Mon, 19 Sep 2022 20:05:02 -0400 X-MC-Unique: agV3RwgHMHakgQzGUqFSmw-1 Received: by mail-qk1-f199.google.com with SMTP id x22-20020a05620a259600b006b552a69231so586204qko.18 for ; Mon, 19 Sep 2022 17:05:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=J4CnnBYIy/swtG6e3jyh0xpZXkVg62rv3/GbKlfT/Oc=; b=Vu9hGve7TV7k60InzVRxZ358JZPqjys/EtFJKVJ/JbZ/48pHe+/THFiBWgb+/r5YR6 2QllCp6On5dVffmpKmWruai3aOx9NhRF2nBve4uy4TL91+wuPKdHe1IKYubRYb8++es2 EDWs9+lAM2ve0EfdVEk+X+p1cwliYKlRwoaXQOpT6wBsk20BnyXrI8l/NIxcQ//Y0uE2 77vR3OJ0UarbHQ2jUjJwIXDRX6qiVRlioo+/9uNe8U2ZFAgJzoxSROpNbbj3jw1kmN0d PTLXmtXgC5CPghKqOB9GAZUHB4dpJYLsbXyhcVo3Gjc00JoNT5vN2OW7WNNf+LlH3L4F irYw== X-Gm-Message-State: ACrzQf3zNBSinyo9CnraLAyAEPYPB6Kyfr5u8HhHPl/njha8FYrF+0rX Nrzj1OQvyofgQxGcWbaP7TePbaGox9DXuD4Z7B6B9SYp29RrNbUrBaqU8dqJOihV2805cDdigId 4RLrq5HEKC91UfEnh6KRlZ5w3WU9UMIvcjhS2uCQd+cWDR+zULz4sz2Ttxuxp2kr2 X-Received: by 2002:ac8:5c91:0:b0:35b:bc2d:527 with SMTP id r17-20020ac85c91000000b0035bbc2d0527mr17233599qta.674.1663632301681; Mon, 19 Sep 2022 17:05:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6IrK6lGYcMLEUfLwfMLibjPkRq98V9o2ENk3GZ9OgY/LUadUv51+Anxj6vXKUN6sNKsTsopg== X-Received: by 2002:ac8:5c91:0:b0:35b:bc2d:527 with SMTP id r17-20020ac85c91000000b0035bbc2d0527mr17233545qta.674.1663632300996; Mon, 19 Sep 2022 17:05:00 -0700 (PDT) Received: from fedora34.localdomain.com (cpe-172-73-180-250.carolina.res.rr.com. [172.73.180.250]) by smtp.gmail.com with ESMTPSA id u12-20020a05620a454c00b006aedb35d8a1sm14621611qkp.74.2022.09.19.17.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 17:04:59 -0700 (PDT) From: Ihar Hrachyshka To: dev@openvswitch.org Date: Tue, 20 Sep 2022 00:04:48 +0000 Message-Id: <20220920000453.357057-2-ihrachys@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920000453.357057-1-ihrachys@redhat.com> References: <20220920000453.357057-1-ihrachys@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 1/6] Rename tunnel ports to include source chassis name 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 is in preparation to support multiple separate controller instances with distinct chassis names operating on the same vswitchd instance. Signed-off-by: Ihar Hrachyshka --- controller/encaps.c | 3 +- tests/ovn-controller.at | 22 +++--- tests/ovn-ipsec.at | 16 ++--- tests/ovn-performance.at | 4 +- tests/ovn.at | 144 +++++++++++++++++++-------------------- 5 files changed, 95 insertions(+), 94 deletions(-) diff --git a/controller/encaps.c b/controller/encaps.c index 9647ba507..e6b2aa074 100644 --- a/controller/encaps.c +++ b/controller/encaps.c @@ -75,7 +75,8 @@ tunnel_create_name(struct tunnel_ctx *tc, const char *chassis_id) for (i = 0; i < UINT16_MAX; i++) { char *port_name; - port_name = xasprintf("ovn-%.6s-%x", chassis_id, i); + port_name = xasprintf( + "ovn-%s-%s-%x", tc->this_chassis->name, chassis_id, i); if (!sset_contains(&tc->port_names, port_name)) { return port_name; diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index 3c3fb31c7..d6a2cbb49 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -261,7 +261,7 @@ ovs-vsctl \ ovn_attach n1 br-phys 192.168.0.1 check_tunnel_property () { - test "`ovs-vsctl get interface ovn-fakech-0 $1`" = "$2" + test "`ovs-vsctl get interface ovn-hv-fakechassis-0 $1`" = "$2" } # create "empty" chassis. vxlan is used here as a stub @@ -273,8 +273,8 @@ ovn-sbctl chassis-add fakechassis vxlan 192.168.0.2 # the chassis-id in ovn-chassis-id); if we supply a different IP here # we won't be able to co-relate this to the tunnel port that was created # in the previous step and, as a result, will end up creating another tunnel, -# ie. we can't just lookup using "ovn-fakech-0". So, need to use the same IP -# as above, i.e 192.168.0.2, here. +# ie. we can't just lookup using "ovn-hv-fakechassis-0". So, need to use the +# same IP as above, i.e 192.168.0.2, here. encap_uuid=$(ovn-sbctl add chassis fakechassis encaps @encap -- --id=@encap create encap type=geneve ip="192.168.0.2") OVS_WAIT_UNTIL([check_tunnel_property type geneve]) @@ -292,11 +292,11 @@ ovn-sbctl set encap ${encap_uuid} ip=192.168.0.2 OVS_WAIT_UNTIL([check_tunnel_property options:remote_ip "\"192.168.0.2\""]) # Change the type on the OVS side and check than OVN fixes it -ovs-vsctl set interface ovn-fakech-0 type=vxlan +ovs-vsctl set interface ovn-hv-fakechassis-0 type=vxlan OVS_WAIT_UNTIL([check_tunnel_property type geneve]) # Delete the port entirely and it should be resurrected -ovs-vsctl del-port ovn-fakech-0 +ovs-vsctl del-port ovn-hv-fakechassis-0 OVS_WAIT_UNTIL([check_tunnel_property type geneve]) # set `ovn-set-local-ip` option to true and check if tunnel parameters @@ -305,7 +305,7 @@ ovs-vsctl set open . external_ids:ovn-set-local-ip=true OVS_WAIT_UNTIL([check_tunnel_property options:local_ip "\"192.168.0.1\""]) # Change the local_ip on the OVS side and check than OVN fixes it -ovs-vsctl set interface ovn-fakech-0 options:local_ip="1.1.1.1" +ovs-vsctl set interface ovn-hv-fakechassis-0 options:local_ip="1.1.1.1" OVS_WAIT_UNTIL([check_tunnel_property options:local_ip "\"192.168.0.1\""]) # Gracefully terminate daemons @@ -769,7 +769,7 @@ ovs-vsctl \ ovn_attach n1 br-phys 192.168.0.1 check_tunnel_property () { - test "`ovs-vsctl get interface ovn-fakech-0 $1`" = "$2" + test "`ovs-vsctl get interface ovn-hv-fakechassis-0 $1`" = "$2" } # without any tos options @@ -780,7 +780,7 @@ no_tos_options="{csum=\"true\", key=flow, remote_ip=\"192.168.0.2\"}" ovn-sbctl chassis-add fakechassis geneve 192.168.0.2 OVS_WAIT_UNTIL([check_tunnel_property type geneve]) -tos_option=$(ovs-vsctl get interface ovn-fakech-0 options) +tos_option=$(ovs-vsctl get interface ovn-hv-fakechassis-0 options) AT_CHECK([test "$tos_option" = "$no_tos_options"], [0], []) expected_tos_option="inherit" @@ -791,7 +791,7 @@ ovs-vsctl \ # now, wait for a sec sleep 1 -tos_option=$(ovs-vsctl get interface ovn-fakech-0 options:tos) +tos_option=$(ovs-vsctl get interface ovn-hv-fakechassis-0 options:tos) AT_CHECK([test "$tos_option" = "$expected_tos_option"], [0], []) # Try another value @@ -803,7 +803,7 @@ ovs-vsctl \ # now, wait for a sec sleep 1 -tos_option=$(ovs-vsctl get interface ovn-fakech-0 options:tos) +tos_option=$(ovs-vsctl get interface ovn-hv-fakechassis-0 options:tos) AT_CHECK([test "$tos_option" = "\"$expected_tos_option\""], [0], []) # Remove tos option and check if we are back to the original state @@ -814,7 +814,7 @@ ovs-vsctl \ # now, wait for a sec sleep 1 -tos_option=$(ovs-vsctl get interface ovn-fakech-0 options) +tos_option=$(ovs-vsctl get interface ovn-hv-fakechassis-0 options) AT_CHECK([test "$tos_option" = "$no_tos_options"], [0], []) # Gracefully terminate daemons diff --git a/tests/ovn-ipsec.at b/tests/ovn-ipsec.at index 10ef97878..a2e185f33 100644 --- a/tests/ovn-ipsec.at +++ b/tests/ovn-ipsec.at @@ -48,14 +48,14 @@ ovn-nbctl set nb_global . options:ipsec_encapsulation=true check ovn-nbctl --wait=hv sync -AT_CHECK([as hv2 ovs-vsctl get Interface ovn-hv1-0 options:remote_ip | tr -d '"\n'], [0], [192.168.0.1]) -AT_CHECK([as hv2 ovs-vsctl get Interface ovn-hv1-0 options:local_ip | tr -d '"\n'], [0], [192.168.0.2]) -AT_CHECK([as hv2 ovs-vsctl get Interface ovn-hv1-0 options:remote_name | tr -d '\n'], [0], [hv1]) -AT_CHECK([as hv2 ovs-vsctl get Interface ovn-hv1-0 options:ipsec_encapsulation | tr -d '\n'], [0], [yes]) -AT_CHECK([as hv1 ovs-vsctl get Interface ovn-hv2-0 options:remote_ip | tr -d '"\n'], [0], [192.168.0.2]) -AT_CHECK([as hv1 ovs-vsctl get Interface ovn-hv2-0 options:local_ip | tr -d '"\n'], [0], [192.168.0.1]) -AT_CHECK([as hv1 ovs-vsctl get Interface ovn-hv2-0 options:remote_name | tr -d '\n'], [0], [hv2]) -AT_CHECK([as hv1 ovs-vsctl get Interface ovn-hv2-0 options:ipsec_encapsulation | tr -d '\n'], [0], [yes]) +AT_CHECK([as hv2 ovs-vsctl get Interface ovn-hv2-hv1-0 options:remote_ip | tr -d '"\n'], [0], [192.168.0.1]) +AT_CHECK([as hv2 ovs-vsctl get Interface ovn-hv2-hv1-0 options:local_ip | tr -d '"\n'], [0], [192.168.0.2]) +AT_CHECK([as hv2 ovs-vsctl get Interface ovn-hv2-hv1-0 options:remote_name | tr -d '\n'], [0], [hv1]) +AT_CHECK([as hv2 ovs-vsctl get Interface ovn-hv2-hv1-0 options:ipsec_encapsulation | tr -d '\n'], [0], [yes]) +AT_CHECK([as hv1 ovs-vsctl get Interface ovn-hv1-hv2-0 options:remote_ip | tr -d '"\n'], [0], [192.168.0.2]) +AT_CHECK([as hv1 ovs-vsctl get Interface ovn-hv1-hv2-0 options:local_ip | tr -d '"\n'], [0], [192.168.0.1]) +AT_CHECK([as hv1 ovs-vsctl get Interface ovn-hv1-hv2-0 options:remote_name | tr -d '\n'], [0], [hv2]) +AT_CHECK([as hv1 ovs-vsctl get Interface ovn-hv1-hv2-0 options:ipsec_encapsulation | tr -d '\n'], [0], [yes]) AT_CLEANUP diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at index 9affca498..5c0267a88 100644 --- a/tests/ovn-performance.at +++ b/tests/ovn-performance.at @@ -251,7 +251,7 @@ for i in `seq 1 5`; do for j in `seq 1 5`; do if [[ $i -ne $j ]] ; then OVS_WAIT_UNTIL([ - test $(as hv$i ovs-vsctl list interface ovn-hv$j-0 | \ + test $(as hv$i ovs-vsctl list interface ovn-hv$i-hv$j-0 | \ grep -c tunnel_egress_iface_carrier=up) -eq 1 ]) fi @@ -519,7 +519,7 @@ OVN_CONTROLLER_EXPECT_HIT( # Make hv4 master. There is remote possibility that full recompute # triggers for hv1-hv5 after hv4 becomes master because of updates to the -# ovn-hv$i-0 interfaces. Most of the time there will be no recompute. +# ovn-hv$i-hv$j-0 interfaces. Most of the time there will be no recompute. ovn-nbctl --wait=hv lrp-set-gateway-chassis lr1-public hv4 40 hv4_ch=$(ovn-sbctl --bare --columns _uuid list chassis hv4) OVS_WAIT_UNTIL([ovn-sbctl find port_binding logical_port=cr-lr1-public chassis=$hv4_ch]) diff --git a/tests/ovn.at b/tests/ovn.at index 80e9192ca..c03ff4f17 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -11007,8 +11007,8 @@ AT_CHECK([ovn-nbctl --wait=sb sync], [0], [ignore]) ovn-sbctl dump-flows > sbflows AT_CAPTURE_FILE([sbflows]) -hv1_gw1_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-gw1-0) -hv1_gw2_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-gw2-0) +hv1_gw1_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv1-gw1-0) +hv1_gw2_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv1-gw2-0) OVS_WAIT_UNTIL([ test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=37 | grep -c "active_backup,ofport,members:$hv1_gw1_ofport,$hv1_gw2_ofport") @@ -11141,7 +11141,7 @@ AT_CHECK([test $gw2_claim_ct = `cat gw2/ovn-controller.log | \ grep -c "cr-alice: Claiming"`]) OVS_WAIT_UNTIL([ - bfd_status=$(as hv1 ovs-vsctl get interface ovn-gw2-0 bfd_status:state) + bfd_status=$(as hv1 ovs-vsctl get interface ovn-hv1-gw2-0 bfd_status:state) echo "bfd status = $bfd_status" test "$bfd_status" = "down" ]) @@ -11291,8 +11291,8 @@ wait_column "$hv1_ch_uuid" HA_Chassis_Group ref_chassis # Allow some time for ovn-northd and ovn-controller to catch up. check ovn-nbctl --wait=hv sync -hv1_gw1_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-gw1-0) -hv1_gw2_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-gw2-0) +hv1_gw1_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv1-gw1-0) +hv1_gw2_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv1-gw2-0) OVS_WAIT_UNTIL([ test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=37 | grep -c "active_backup,ofport,members:$hv1_gw1_ofport,$hv1_gw2_ofport") @@ -13039,10 +13039,10 @@ bfd_dump() { bfd_dump -hv1_gw1_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-gw1-0) -hv1_gw2_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-gw2-0) -hv2_gw1_ofport=$(as hv2 ovs-vsctl --bare --columns ofport find Interface name=ovn-gw1-0) -hv2_gw2_ofport=$(as hv2 ovs-vsctl --bare --columns ofport find Interface name=ovn-gw2-0) +hv1_gw1_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv1-gw1-0) +hv1_gw2_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv1-gw2-0) +hv2_gw1_ofport=$(as hv2 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv2-gw1-0) +hv2_gw2_ofport=$(as hv2 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv2-gw2-0) echo $hv1_gw1_ofport echo $hv1_gw2_ofport @@ -13121,7 +13121,7 @@ wait_row_count Port_Binding 1 logical_port=cr-outside chassis=$gw2_chassis as gw1 for chassis in gw2 hv1 hv2; do echo "checking gw1 -> $chassis" - AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0],[0], + AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-gw1-$chassis-0],[0], [[enable=true ]]) done @@ -13131,7 +13131,7 @@ done as gw2 for chassis in gw1 hv1 hv2; do echo "checking gw2 -> $chassis" - AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0],[0], + AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-gw2-$chassis-0],[0], [[enable=true ]]) done @@ -13140,12 +13140,12 @@ done as hv1 for chassis in gw1 gw2; do echo "checking hv1 -> $chassis" - AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0],[0], + AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv1-$chassis-0],[0], [[enable=true ]]) done # make sure BFD is not enabled to hv2, we don't need it -AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv2-0],[0], +AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv1-hv2-0],[0], [[ ]]) @@ -13154,12 +13154,12 @@ AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv2-0],[0], as hv2 for chassis in gw1 gw2; do echo "checking hv2 -> $chassis" - AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0],[0], + AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv2-$chassis-0],[0], [[enable=true ]]) done # make sure BFD is not enabled to hv1, we don't need it -AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv1-0],[0], +AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv2-hv1-0],[0], [[ ]]) @@ -13194,7 +13194,7 @@ as gw2 for chassis in gw1 hv1 hv2; do echo "checking gw2 -> $chassis" OVS_WAIT_UNTIL([ - bfd_cfg=$(ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0) + bfd_cfg=$(ovs-vsctl --bare --columns bfd find Interface name=ovn-gw2-$chassis-0) test "$bfd_cfg" = "enable=true min_rx=2000" ]) done @@ -13202,7 +13202,7 @@ ovn-nbctl --wait=hv set NB_Global . options:"bfd-min-tx"=1500 for chassis in gw1 hv1 hv2; do echo "checking gw2 -> $chassis" OVS_WAIT_UNTIL([ - bfd_cfg=$(ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0) + bfd_cfg=$(ovs-vsctl --bare --columns bfd find Interface name=ovn-gw2-$chassis-0) test "$bfd_cfg" = "enable=true min_rx=2000 min_tx=1500" ]) done @@ -13211,7 +13211,7 @@ ovn-nbctl --wait=hv set NB_Global . options:"bfd-mult"=5 for chassis in gw1 hv1 hv2; do echo "checking gw2 -> $chassis" OVS_WAIT_UNTIL([ - bfd_cfg=$(ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0) + bfd_cfg=$(ovs-vsctl --bare --columns bfd find Interface name=ovn-gw2-$chassis-0) test "$bfd_cfg" = "enable=true min_tx=1500 mult=5" ]) done @@ -13347,7 +13347,7 @@ grep active_backup | grep slaves:$hv2_gw2_ofport,$hv2_gw1_ofport \ as gw1 for chassis in gw2 hv1 hv2; do echo "checking gw1 -> $chassis" - AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0],[0], + AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-gw1-$chassis-0],[0], [[enable=true ]]) done @@ -13356,7 +13356,7 @@ done as gw2 for chassis in gw1 hv1 hv2; do echo "checking gw2 -> $chassis" - AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0],[0], + AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-gw2-$chassis-0],[0], [[enable=true ]]) done @@ -13365,12 +13365,12 @@ done as hv1 for chassis in gw1 gw2; do echo "checking hv1 -> $chassis" - AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0],[0], + AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv1-$chassis-0],[0], [[enable=true ]]) done # make sure BFD is not enabled to hv2, we don't need it -AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv2-0],[0], +AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv1-hv2-0],[0], [[ ]]) @@ -13378,12 +13378,12 @@ AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv2-0],[0], as hv2 for chassis in gw1 gw2; do echo "checking hv2 -> $chassis" - AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-$chassis-0],[0], + AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv2-$chassis-0],[0], [[enable=true ]]) done # make sure BFD is not enabled to hv1, we don't need it -AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv1-0],[0], +AT_CHECK([ovs-vsctl --bare --columns bfd find Interface name=ovn-hv2-hv1-0],[0], [[ ]]) @@ -19690,42 +19690,42 @@ check ovn-nbctl --wait=hv sync dnl Assert that each Chassis has a tunnel formed to every other Chassis as hv1 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv2-0 -ovn-hv3-0 -ovn-hv4-0 -ovn-hv5-0 +[[ovn-hv1-hv2-0 +ovn-hv1-hv3-0 +ovn-hv1-hv4-0 +ovn-hv1-hv5-0 ]]) as hv2 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 -ovn-hv3-0 -ovn-hv4-0 -ovn-hv5-0 +[[ovn-hv2-hv1-0 +ovn-hv2-hv3-0 +ovn-hv2-hv4-0 +ovn-hv2-hv5-0 ]]) as hv3 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 -ovn-hv2-0 -ovn-hv4-0 -ovn-hv5-0 +[[ovn-hv3-hv1-0 +ovn-hv3-hv2-0 +ovn-hv3-hv4-0 +ovn-hv3-hv5-0 ]]) as hv4 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 -ovn-hv2-0 -ovn-hv3-0 -ovn-hv5-0 +[[ovn-hv4-hv1-0 +ovn-hv4-hv2-0 +ovn-hv4-hv3-0 +ovn-hv4-hv5-0 ]]) as hv5 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 -ovn-hv2-0 -ovn-hv3-0 -ovn-hv4-0 +[[ovn-hv5-hv1-0 +ovn-hv5-hv2-0 +ovn-hv5-hv3-0 +ovn-hv5-hv4-0 ]]) dnl Let's now add some Chassis to different transport zones @@ -19756,28 +19756,28 @@ check ovn-nbctl --wait=hv sync as hv1 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv2-0 -ovn-hv3-0 +[[ovn-hv1-hv2-0 +ovn-hv1-hv3-0 ]]) as hv2 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 +[[ovn-hv2-hv1-0 ]]) as hv3 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 +[[ovn-hv3-hv1-0 ]]) as hv4 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv5-0 +[[ovn-hv4-hv5-0 ]]) as hv5 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv4-0 +[[ovn-hv5-hv4-0 ]]) dnl Removing the transport zones should make all Chassis to create @@ -19792,42 +19792,42 @@ check ovn-nbctl --wait=hv sync as hv1 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv2-0 -ovn-hv3-0 -ovn-hv4-0 -ovn-hv5-0 +[[ovn-hv1-hv2-0 +ovn-hv1-hv3-0 +ovn-hv1-hv4-0 +ovn-hv1-hv5-0 ]]) as hv2 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 -ovn-hv3-0 -ovn-hv4-0 -ovn-hv5-0 +[[ovn-hv2-hv1-0 +ovn-hv2-hv3-0 +ovn-hv2-hv4-0 +ovn-hv2-hv5-0 ]]) as hv3 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 -ovn-hv2-0 -ovn-hv4-0 -ovn-hv5-0 +[[ovn-hv3-hv1-0 +ovn-hv3-hv2-0 +ovn-hv3-hv4-0 +ovn-hv3-hv5-0 ]]) as hv4 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 -ovn-hv2-0 -ovn-hv3-0 -ovn-hv5-0 +[[ovn-hv4-hv1-0 +ovn-hv4-hv2-0 +ovn-hv4-hv3-0 +ovn-hv4-hv5-0 ]]) as hv5 AT_CHECK([ovs-vsctl --bare --columns=name find interface type="geneve" | awk NF | sort], [0], -[[ovn-hv1-0 -ovn-hv2-0 -ovn-hv3-0 -ovn-hv4-0 +[[ovn-hv5-hv1-0 +ovn-hv5-hv2-0 +ovn-hv5-hv3-0 +ovn-hv5-hv4-0 ]]) OVN_CLEANUP([hv1], [hv2], [hv3]) @@ -25690,14 +25690,14 @@ check ovn-nbctl fwd-group-del fwd_grp1 check ovn-nbctl --wait=hv --liveness fwd-group-add fwd_grp1 ls2 172.16.1.11 00:11:de:ad:be:ef lsp21 lsp22 # Verify openflow group members -ofport_lsp21=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv2-0) +ofport_lsp21=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv1-hv2-0) tunnel_key=`ovn-sbctl --bare --column tunnel_key find port_binding logical_port=lsp21` AT_CHECK([as hv1 ovs-ofctl -O OpenFlow13 dump-groups br-int | \ grep "bucket=watch_port:$ofport_lsp21,actions=load:0x"$tunnel_key | wc -l], [0], [dnl 1 ]) -ofport_lsp22=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv3-0) +ofport_lsp22=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-hv1-hv3-0) tunnel_key=`ovn-sbctl --bare --column tunnel_key find port_binding logical_port=lsp22` AT_CHECK([as hv1 ovs-ofctl -O OpenFlow13 dump-groups br-int | \ grep "bucket=watch_port:$ofport_lsp22,actions=load:0x"$tunnel_key | wc -l], [0], [dnl