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 <[email protected]>
---
 tests/ovn.at | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/ovn.at b/tests/ovn.at
index 2fdf1a88c..dd614ffb2 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -9562,8 +9562,8 @@ check ovn-nbctl lr-add lr0
 check ovn-nbctl lrp-add lr0 lrp0 f0:00:00:00:00:01 192.168.0.1/24
 check 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.
 check ovn-nbctl lrp-del lrp0
@@ -27885,8 +27885,8 @@ check 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
@@ -27913,8 +27913,8 @@ check 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
-- 
2.47.0

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to