Skip to content

Commit

Permalink
tests: Fix typos found using check_uuid.
Browse files Browse the repository at this point in the history
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]>
Acked-by: Ales Musil <[email protected]>
Signed-off-by: Dumitru Ceara <[email protected]>
(cherry picked from commit f90c0f3)
  • Loading branch information
simonartxavier authored and dceara committed Dec 11, 2024
1 parent 6b4704f commit 8ad333a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tests/ovn.at
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 8ad333a

Please sign in to comment.