Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix parsing logical router static routes #2443

Merged
merged 3 commits into from
Mar 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/controller/security_group_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func Test_getPortSg(t *testing.T) {
port := mockLsp()
out, err := c.getPortSg(port)
require.NoError(t, err)
require.Equal(t, []string{"sg"}, out)
require.ElementsMatch(t, []string{"sg"}, out)
})

t.Run("have two and more sgs", func(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions pkg/ovs/ovn-nb-acl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ func (suite *OvnClientTestSuite) testnewNetworkPolicyAclMatch() {

npp := mockNetworkPolicyPort()
matches := newNetworkPolicyAclMatch(pgName, asAllowName, asExceptName, kubeovnv1.ProtocolIPv4, ovnnb.ACLDirectionToLport, npp)
require.Equal(t, []string{
require.ElementsMatch(t, []string{
fmt.Sprintf("outport == @%s && ip && ip4.src == $%s && ip4.src != $%s && tcp.dst == %d", pgName, asAllowName, asExceptName, npp[0].Port.IntVal),
fmt.Sprintf("outport == @%s && ip && ip4.src == $%s && ip4.src != $%s && %d <= tcp.dst <= %d", pgName, asAllowName, asExceptName, npp[1].Port.IntVal, *npp[1].EndPort),
}, matches)
Expand All @@ -1276,7 +1276,7 @@ func (suite *OvnClientTestSuite) testnewNetworkPolicyAclMatch() {
npp := mockNetworkPolicyPort()

matches := newNetworkPolicyAclMatch(pgName, asAllowName, asExceptName, kubeovnv1.ProtocolIPv4, ovnnb.ACLDirectionFromLport, npp)
require.Equal(t, []string{
require.ElementsMatch(t, []string{
fmt.Sprintf("inport == @%s && ip && ip4.dst == $%s && ip4.dst != $%s && tcp.dst == %d", pgName, asAllowName, asExceptName, npp[0].Port.IntVal),
fmt.Sprintf("inport == @%s && ip && ip4.dst == $%s && ip4.dst != $%s && %d <= tcp.dst <= %d", pgName, asAllowName, asExceptName, npp[1].Port.IntVal, *npp[1].EndPort),
}, matches)
Expand All @@ -1286,7 +1286,7 @@ func (suite *OvnClientTestSuite) testnewNetworkPolicyAclMatch() {
t.Parallel()

matches := newNetworkPolicyAclMatch(pgName, asAllowName, asExceptName, kubeovnv1.ProtocolIPv4, ovnnb.ACLDirectionToLport, nil)
require.Equal(t, []string{
require.ElementsMatch(t, []string{
fmt.Sprintf("outport == @%s && ip && ip4.src == $%s && ip4.src != $%s", pgName, asAllowName, asExceptName),
}, matches)
})
Expand All @@ -1298,7 +1298,7 @@ func (suite *OvnClientTestSuite) testnewNetworkPolicyAclMatch() {
npp[1].Port = nil

matches := newNetworkPolicyAclMatch(pgName, asAllowName, asExceptName, kubeovnv1.ProtocolIPv4, ovnnb.ACLDirectionToLport, npp)
require.Equal(t, []string{
require.ElementsMatch(t, []string{
fmt.Sprintf("outport == @%s && ip && ip4.src == $%s && ip4.src != $%s && tcp.dst == %d", pgName, asAllowName, asExceptName, npp[0].Port.IntVal),
fmt.Sprintf("outport == @%s && ip && ip4.src == $%s && ip4.src != $%s && tcp", pgName, asAllowName, asExceptName),
}, matches)
Expand All @@ -1311,7 +1311,7 @@ func (suite *OvnClientTestSuite) testnewNetworkPolicyAclMatch() {
npp[1].EndPort = nil

matches := newNetworkPolicyAclMatch(pgName, asAllowName, asExceptName, kubeovnv1.ProtocolIPv4, ovnnb.ACLDirectionToLport, npp)
require.Equal(t, []string{
require.ElementsMatch(t, []string{
fmt.Sprintf("outport == @%s && ip && ip4.src == $%s && ip4.src != $%s && tcp.dst == %d", pgName, asAllowName, asExceptName, npp[0].Port.IntVal),
fmt.Sprintf("outport == @%s && ip && ip4.src == $%s && ip4.src != $%s && tcp.dst == %d", pgName, asAllowName, asExceptName, npp[1].Port.IntVal),
}, matches)
Expand Down
4 changes: 2 additions & 2 deletions pkg/ovs/ovn-nb-address_set_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (suite *OvnClientTestSuite) testAddressSetUpdateAddress() {

as, err := ovnClient.GetAddressSet(asName, false)
require.NoError(t, err)
require.Equal(t, addresses, as.Addresses)
require.ElementsMatch(t, addresses, as.Addresses)
})

t.Run("update address set v6 addresses", func(t *testing.T) {
Expand All @@ -74,7 +74,7 @@ func (suite *OvnClientTestSuite) testAddressSetUpdateAddress() {

as, err := ovnClient.GetAddressSet(asName, false)
require.NoError(t, err)
require.Equal(t, addresses, as.Addresses)
require.ElementsMatch(t, addresses, as.Addresses)
})

t.Run("clear address set addresses", func(t *testing.T) {
Expand Down
6 changes: 2 additions & 4 deletions pkg/ovs/ovn-nb-dhcp_options_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,8 @@ func (suite *OvnClientTestSuite) testUpdateDHCPOptions() {

uuid, err := ovnClient.UpdateDHCPOptions(subnet)
require.NoError(t, err)
require.Equal(t, &DHCPOptionsUUIDs{
DHCPv4OptionsUUID: "",
DHCPv6OptionsUUID: "",
}, uuid)
require.Empty(t, uuid.DHCPv4OptionsUUID)
require.Empty(t, uuid.DHCPv6OptionsUUID)

_, err = ovnClient.GetDHCPOptions(lsName, "IPv4", false)
require.ErrorContains(t, err, "not found")
Expand Down
2 changes: 1 addition & 1 deletion pkg/ovs/ovn-nb-load_balancer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (suite *OvnClientTestSuite) testCreateLoadBalancer() {
require.Equal(t, lbName, lb.Name)
require.NotEmpty(t, lb.UUID)
require.Equal(t, "tcp", *lb.Protocol)
require.Equal(t, []string{"ip_dst"}, lb.SelectionFields)
require.ElementsMatch(t, []string{"ip_dst"}, lb.SelectionFields)

// should no err create lb repeatedly
err = ovnClient.CreateLoadBalancer(lbName, "tcp", "ip_dst")
Expand Down
18 changes: 9 additions & 9 deletions pkg/ovs/ovn-nb-logical_router_port_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ func (suite *OvnClientTestSuite) testCreatePeerRouterPort() {
require.NoError(t, err)
require.NotEmpty(t, lrp.UUID)
require.Equal(t, localLrName, lrp.ExternalIDs[logicalRouterKey])
require.Equal(t, []string{"192.168.230.1/24", "192.168.231.1/24"}, lrp.Networks)
require.ElementsMatch(t, []string{"192.168.230.1/24", "192.168.231.1/24"}, lrp.Networks)
require.Equal(t, remoteRouterPort, *lrp.Peer)

lr, err := ovnClient.GetLogicalRouter(localLrName, false)
require.NoError(t, err)
require.Equal(t, []string{lrp.UUID}, lr.Ports)
require.ElementsMatch(t, []string{lrp.UUID}, lr.Ports)
})

t.Run("update port networks", func(t *testing.T) {
Expand All @@ -70,7 +70,7 @@ func (suite *OvnClientTestSuite) testCreatePeerRouterPort() {
lrp, err := ovnClient.GetLogicalRouterPort(localRouterPort, false)
require.NoError(t, err)
require.NotEmpty(t, lrp.UUID)
require.Equal(t, []string{"192.168.230.1/24", "192.168.241.1/24"}, lrp.Networks)
require.ElementsMatch(t, []string{"192.168.230.1/24", "192.168.241.1/24"}, lrp.Networks)
require.Equal(t, remoteRouterPort, *lrp.Peer)
})
}
Expand All @@ -95,7 +95,7 @@ func (suite *OvnClientTestSuite) testUpdateLogicalRouterPortRA() {

out, err := ovnClient.GetLogicalRouterPort(lrpName, false)
require.NoError(t, err)
require.Equal(t, []string{"120"}, out.Ipv6Prefix)
require.ElementsMatch(t, []string{"120"}, out.Ipv6Prefix)
require.Equal(t, map[string]string{
"address_mode": "dhcpv6_stateful",
"max_interval": "30",
Expand All @@ -110,7 +110,7 @@ func (suite *OvnClientTestSuite) testUpdateLogicalRouterPortRA() {

out, err := ovnClient.GetLogicalRouterPort(lrpName, false)
require.NoError(t, err)
require.Equal(t, []string{"120"}, out.Ipv6Prefix)
require.ElementsMatch(t, []string{"120"}, out.Ipv6Prefix)
require.Equal(t, map[string]string{
"address_mode": "dhcpv6_stateful",
"max_interval": "30",
Expand Down Expand Up @@ -165,7 +165,7 @@ func (suite *OvnClientTestSuite) testCreateLogicalRouterPort() {
require.NoError(t, err)
require.NotEmpty(t, lrp.UUID)
require.Equal(t, "00:11:22:37:af:62", lrp.MAC)
require.Equal(t, []string{"192.168.123.1/24"}, lrp.Networks)
require.ElementsMatch(t, []string{"192.168.123.1/24"}, lrp.Networks)

lr, err := ovnClient.GetLogicalRouter(LrName, false)
require.NoError(t, err)
Expand All @@ -184,7 +184,7 @@ func (suite *OvnClientTestSuite) testCreateLogicalRouterPort() {
require.NoError(t, err)
require.NotEmpty(t, lrp.UUID)
require.Equal(t, "00:11:22:37:af:62", lrp.MAC)
require.Equal(t, []string{"fd00::c0a8:7b01/120"}, lrp.Networks)
require.ElementsMatch(t, []string{"fd00::c0a8:7b01/120"}, lrp.Networks)

lr, err := ovnClient.GetLogicalRouter(LrName, false)
require.NoError(t, err)
Expand All @@ -202,7 +202,7 @@ func (suite *OvnClientTestSuite) testCreateLogicalRouterPort() {
require.NoError(t, err)
require.NotEmpty(t, lrp.UUID)
require.Equal(t, "00:11:22:37:af:62", lrp.MAC)
require.Equal(t, []string{"192.168.123.1/24", "fd00::c0a8:7b01/120"}, lrp.Networks)
require.ElementsMatch(t, []string{"192.168.123.1/24", "fd00::c0a8:7b01/120"}, lrp.Networks)

lr, err := ovnClient.GetLogicalRouter(LrName, false)
require.NoError(t, err)
Expand Down Expand Up @@ -234,7 +234,7 @@ func (suite *OvnClientTestSuite) testUpdateLogicalRouterPort() {

lrp, err = ovnClient.GetLogicalRouterPort(lrpName, false)
require.NoError(t, err)
require.Equal(t, []string{"192.168.123.1/24", "192.168.125.1/24"}, lrp.Networks)
require.ElementsMatch(t, []string{"192.168.123.1/24", "192.168.125.1/24"}, lrp.Networks)
})

t.Run("clear networks", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ovs/ovn-nb-logical_router_route_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func (suite *OvnClientTestSuite) testDeleteLogicalRouterStaticRoute() {

route, err := ovnClient.GetLogicalRouterStaticRoute(lrName, policy, prefix, nextHopList[1], routeType, false)
require.NoError(t, err)
require.Equal(t, []string{route.UUID}, lr.StaticRoutes)
require.ElementsMatch(t, []string{route.UUID}, lr.StaticRoutes)

/* delete second route */
err = ovnClient.DeleteLogicalRouterStaticRoute(lrName, policy, prefix, nextHopList[1], routeType)
Expand Down
36 changes: 18 additions & 18 deletions pkg/ovs/ovn-nb-logical_switch_port_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func (suite *OvnClientTestSuite) testCreateLogicalSwitchPort() {

lsp, err := ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.0.110 10.244.0.112"}, lsp.PortSecurity)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.0.110 10.244.0.112"}, lsp.PortSecurity)
require.Equal(t, map[string]string{
sgsKey: strings.ReplaceAll(sgs, ",", "/"),
"associated_sg_sg": "true",
Expand All @@ -82,8 +82,8 @@ func (suite *OvnClientTestSuite) testCreateLogicalSwitchPort() {

lsp, err := ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.PortSecurity)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.PortSecurity)
require.Equal(t, map[string]string{
sgsKey: strings.ReplaceAll(sgs, ",", "/"),
"associated_sg_sg": "true",
Expand All @@ -107,8 +107,8 @@ func (suite *OvnClientTestSuite) testCreateLogicalSwitchPort() {

lsp, err := ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.0.110 10.244.0.112"}, lsp.PortSecurity)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.0.110 10.244.0.112"}, lsp.PortSecurity)
require.Equal(t, map[string]string{
sgsKey: strings.ReplaceAll(sgs, ",", "/"),
"associated_sg_sg": "true",
Expand All @@ -134,8 +134,8 @@ func (suite *OvnClientTestSuite) testCreateLogicalSwitchPort() {

lsp, err := ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.0.110 10.244.0.112"}, lsp.PortSecurity)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.0.110 10.244.0.112"}, lsp.PortSecurity)
require.Equal(t, map[string]string{
sgsKey: strings.ReplaceAll(sgs, ",", "/"),
"associated_sg_sg": "true",
Expand All @@ -160,7 +160,7 @@ func (suite *OvnClientTestSuite) testCreateLogicalSwitchPort() {

lsp, err := ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.Equal(t, map[string]string{
"associated_sg_" + util.DefaultSecurityGroupName: "false",
"pod": fmt.Sprintf("%s/%s", podNamespace, podName),
Expand All @@ -183,8 +183,8 @@ func (suite *OvnClientTestSuite) testCreateLogicalSwitchPort() {

lsp, err := ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.0.110 10.244.0.112"}, lsp.PortSecurity)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25"}, lsp.Addresses)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.0.110 10.244.0.112"}, lsp.PortSecurity)
require.Equal(t, map[string]string{
sgsKey: strings.ReplaceAll(sgs, ",", "/"),
"associated_sg_sg": "true",
Expand Down Expand Up @@ -221,7 +221,7 @@ func (suite *OvnClientTestSuite) testCreateLocalnetLogicalSwitchPort() {
require.NoError(t, err)
require.Equal(t, lspName, lsp.Name)
require.Equal(t, "localnet", lsp.Type)
require.Equal(t, []string{"unknown"}, lsp.Addresses)
require.ElementsMatch(t, []string{"unknown"}, lsp.Addresses)
require.Equal(t, map[string]string{
"network_name": provider,
}, lsp.Options)
Expand All @@ -238,7 +238,7 @@ func (suite *OvnClientTestSuite) testCreateLocalnetLogicalSwitchPort() {
require.NoError(t, err)
require.Equal(t, lspName, lsp.Name)
require.Equal(t, "localnet", lsp.Type)
require.Equal(t, []string{"unknown"}, lsp.Addresses)
require.ElementsMatch(t, []string{"unknown"}, lsp.Addresses)
require.Equal(t, map[string]string{
"network_name": provider,
}, lsp.Options)
Expand Down Expand Up @@ -299,7 +299,7 @@ func (suite *OvnClientTestSuite) testCreateBareLogicalSwitchPort() {

lsp, err := ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:00:00:C9:4E:EE 100.64.0.4 fd00:100:64::4"}, lsp.Addresses)
require.ElementsMatch(t, []string{"00:00:00:C9:4E:EE 100.64.0.4 fd00:100:64::4"}, lsp.Addresses)

ls, err := ovnClient.GetLogicalSwitch(lsName, false)
require.NoError(t, err)
Expand Down Expand Up @@ -370,7 +370,7 @@ func (suite *OvnClientTestSuite) testSetLogicalSwitchPortSecurity() {

lsp, err = ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.100.10 10.244.100.11"}, lsp.PortSecurity)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.100.10 10.244.100.11"}, lsp.PortSecurity)
require.Equal(t, map[string]string{
"vendor": util.CniTypeName,
logicalSwitchKey: lsName,
Expand Down Expand Up @@ -408,7 +408,7 @@ func (suite *OvnClientTestSuite) testSetLogicalSwitchPortSecurity() {

lsp, err = ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.100.10 10.244.100.11"}, lsp.PortSecurity)
require.ElementsMatch(t, []string{"00:00:00:AB:B4:65 10.244.0.37 fc00::af4:25 10.244.100.10 10.244.100.11"}, lsp.PortSecurity)
require.Equal(t, map[string]string{
"vips": "10.244.100.10,10.244.100.11",
"attach-vips": "true",
Expand Down Expand Up @@ -847,7 +847,7 @@ func (suite *OvnClientTestSuite) testEnablePortLayer2forward() {

lsp, err = ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"unknown"}, lsp.Addresses)
require.ElementsMatch(t, []string{"unknown"}, lsp.Addresses)
}

func (suite *OvnClientTestSuite) testSetLogicalSwitchPortVlanTag() {
Expand Down Expand Up @@ -942,7 +942,7 @@ func (suite *OvnClientTestSuite) testUpdateLogicalSwitchPort() {

lsp, err = ovnClient.GetLogicalSwitchPort(lspName, false)
require.NoError(t, err)
require.Equal(t, []string{"00:0c:29:e4:16:cc 192.168.231.110"}, lsp.Addresses)
require.ElementsMatch(t, []string{"00:0c:29:e4:16:cc 192.168.231.110"}, lsp.Addresses)
require.Equal(t, map[string]string{
"liveMigration": "0",
}, lsp.ExternalIDs)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ovs/ovn-nb-logical_switch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (suite *OvnClientTestSuite) testCreateLogicalSwitch() {

lrp, err := ovnClient.GetLogicalRouterPort(lrpName, false)
require.NoError(t, err)
require.Equal(t, []string{"192.168.2.1/24", "fd00::c0a8:9901/120"}, lrp.Networks)
require.ElementsMatch(t, []string{"192.168.2.1/24", "fd00::c0a8:9901/120"}, lrp.Networks)
})

t.Run("remove router type port when needRouter is false", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ovs/ovn-nb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (suite *OvnClientTestSuite) testCreateLogicalPatchPort() {

lrp, err := ovnClient.GetLogicalRouterPort(lrpName, false)
require.NoError(t, err)
require.Equal(t, []string{"192.168.230.1/24", "fc00::0af4:01/112"}, lrp.Networks)
require.ElementsMatch(t, []string{"192.168.230.1/24", "fc00::0af4:01/112"}, lrp.Networks)

for _, chassisName := range chassises {
gwChassisName := lrpName + "-" + chassisName
Expand Down