From 4e143c1e58b18adf6914ec783ee4503a63dbf3a8 Mon Sep 17 00:00:00 2001 From: Gongming Chen Date: Sun, 7 Feb 2021 02:52:53 +0000 Subject: [PATCH 4/4] tests: Fix Port_Binding up test. After setting the iface-id, immediately check the up status of the port binding, it will occasionally fail, especially when the port binding status is reported later. When it fails, the following will be output: Checking values in sb Port_Binding with logical_port=lsp1 against false... found false ovs-vsctl add-port br-int lsp1 -- set Interface lsp1 external-ids:iface-id=lsp1 ./ovn-macros.at:307: "$@" Checking values in sb Port_Binding with logical_port=lsp1 against true... found false _uuid : 15ebabb6-3dbb-4806-aa85-d1c03e3b39f6 logical_port : lsp1 up : true ./ovn-macros.at:393: hard failure Fixes: 4d3cb42b076b ("binding: Set Logical_Switch_Port.up when all OVS flows are installed.") Signed-off-by: Gongming Chen Acked-by: Dumitru Ceara Signed-off-by: Numan Siddique (cherry picked from upstream commit 44ea2ec88136f83e7eab9790473025b6c95bdcc0) Change-Id: I53d1834cc6b59cc42b494661378d00bf722dc88a --- AUTHORS.rst | 1 + tests/ovn.at | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 5d926c1..29c2c01 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -155,6 +155,7 @@ Geoffrey Wossum gwossum@acm.org Gianluca Merlo gianluca.merlo@gmail.com Giuseppe Lettieri g.lettieri@iet.unipi.it Glen Gibb grg@stanford.edu +Gongming Chen gmingchen@tencent.com Guoshuai Li ligs@dtdream.com Guolin Yang gyang@vmware.com Guru Chaitanya Perakam gperakam@Brocade.com diff --git a/tests/ovn.at b/tests/ovn.at index 2ef056b..9f2e152 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -23700,7 +23700,7 @@ check ovn-nbctl --wait=hv sync check_column "false" Port_Binding up logical_port=lsp1 check ovs-vsctl add-port br-int lsp1 -- set Interface lsp1 external-ids:iface-id=lsp1 -check_column "true" Port_Binding up logical_port=lsp1 +wait_column "true" Port_Binding up logical_port=lsp1 wait_column "true" nb:Logical_Switch_Port up name=lsp1 OVS_WAIT_UNTIL([test `ovs-vsctl get Interface lsp1 external_ids:ovn-installed` = '"true"']) -- 1.8.3.1