From 8ad333a847c4574514966fdfbd086628e7e132e3 Mon Sep 17 00:00:00 2001 From: Xavier Simonart Date: Fri, 6 Dec 2024 05:10:06 -0500 Subject: [PATCH] tests: Fix typos found using check_uuid. Next patch introduces check_uuid, checking if ovn-sbctl returns a uuid (and not an error for instance). This highlights a few tests issues, fixed in this patch. Hostname has to be specified when creating chassis using sbctl to avoid ovn-controller trying later to update hostname and cause RBAC permission errors. Signed-off-by: Xavier Simonart Acked-by: Ales Musil Signed-off-by: Dumitru Ceara (cherry picked from commit f90c0f308b150104daac81d26016205ca0a83a33) --- tests/ovn.at | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 26fdc93035..94be3f7477 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -9731,8 +9731,8 @@ ovn-nbctl lr-add lr0 ovn-nbctl lrp-add lr0 lrp0 f0:00:00:00:00:01 192.168.0.1/24 ovn-nbctl lrp-add lr0 lrp1 f0:00:00:00:00:02 192.168.1.1/24 dp_uuid=$(fetch_column Datapath_Binding _uuid) -ovn-sbctl create MAC_Binding ip=10.0.0.1 datapath=$dp_uuid logical_port=lrp0 mac="00:00:00:01:00:01" -ovn-sbctl create MAC_Binding ip=10.0.0.1 datapath=$dp_uuid logical_port=lrp1 mac="00:00:00:01:00:02" +ovn-sbctl create MAC_Binding ip=10.0.0.1 datapath=$dp_uuid logical_port=lrp0 mac="00\:00\:00\:01\:00\:01" +ovn-sbctl create MAC_Binding ip=10.0.0.1 datapath=$dp_uuid logical_port=lrp1 mac="00\:00\:00\:01\:00\:02" ovn-sbctl find MAC_Binding # Delete port lrp0 and check that its MAC_Binding is deleted. ovn-nbctl lrp-del lrp0 @@ -27826,8 +27826,8 @@ ovn-nbctl --wait=sb lsp-add ls1 lsp1 # Simulate the fact that lsp1 had been previously bound on hv1. ovn-sbctl --id=@e1 create encap chassis_name=hv1 ip="192.168.0.1" type="geneve" \ - --id=@e2 create encap chassis_name=hv1 ip="192.168.0.1" type="vxlan" \ - -- --id=@c create chassis name=hv1 encaps=@e1,@e2 \ + -- --id=@e2 create encap chassis_name=hv1 ip="192.168.0.1" type="vxlan" \ + -- --id=@c create chassis hostname=hv1 name=hv1 encaps=@e1,@e2 \ -- set Port_Binding lsp1 chassis=@c as hv1 @@ -27854,8 +27854,8 @@ ovn-nbctl --wait=sb lsp-add ls1 lsp1 # Simulate the fact that lsp1 had been previously bound on hv1. ovn-sbctl --id=@e1 create encap chassis_name=hv1 ip="192.168.0.1" type="geneve" \ - --id=@e2 create encap chassis_name=hv1 ip="192.168.0.1" type="vxlan" \ - -- --id=@c create chassis name=hv1 encaps=@e1,@e2 \ + -- --id=@e2 create encap chassis_name=hv1 ip="192.168.0.1" type="vxlan" \ + -- --id=@c create chassis hostname=hv1 name=hv1 encaps=@e1,@e2 \ -- set Port_Binding lsp1 chassis=@c as hv1