Skip to content

Commit

Permalink
Merge pull request openshift#812 from zeeke/us/fix-test-ip-routes
Browse files Browse the repository at this point in the history 
e2e: Avoid setting wrong routes for `host-local` IPAM
  • Loading branch information
@zeeke
zeeke authored Dec 5, 2024
2 parents 5f492e5 + df2a973 commit 07a7f05
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 30 deletions.
6 changes: 3 additions & 3 deletions test/conformance/tests/test_networkpool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ var _ = Describe("[sriov] NetworkPool", Ordered, func() {
},
Spec: sriovv1.SriovNetworkSpec{
ResourceName: resourceName,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181","routes":[{"dst":"0.0.0.0/0"}],"gateway":"10.10.10.1"}`,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
MetaPluginsConfig: `{"type": "rdma"}`,
}}
Expand All @@ -197,7 +197,7 @@ var _ = Describe("[sriov] NetworkPool", Ordered, func() {
},
Spec: sriovv1.SriovNetworkSpec{
ResourceName: resourceName,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181","routes":[{"dst":"0.0.0.0/0"}],"gateway":"10.10.10.1"}`,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}

Expand Down Expand Up @@ -318,7 +318,7 @@ var _ = Describe("[sriov] NetworkPool", Ordered, func() {
},
Spec: sriovv1.SriovNetworkSpec{
ResourceName: resourceName,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181","routes":[{"dst":"0.0.0.0/0"}],"gateway":"10.10.10.1"}`,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}

Expand Down
8 changes: 3 additions & 5 deletions test/conformance/tests/test_policy_configuration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ var _ = Describe("[sriov] operator", Ordered, func() {
},
Spec: sriovv1.SriovNetworkSpec{
ResourceName: resourceName,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181","routes":[{"dst":"0.0.0.0/0"}],"gateway":"10.10.10.1"}`,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}

Expand Down Expand Up @@ -483,9 +483,7 @@ var _ = Describe("[sriov] operator", Ordered, func() {
"type":"host-local",
"subnet":"10.10.10.0/24",
"rangeStart":"10.10.10.171",
"rangeEnd":"10.10.10.181",
"routes":[{"dst":"0.0.0.0/0"}],
"gateway":"10.10.10.1"
"rangeEnd":"10.10.10.181"
}`

err = network.CreateSriovNetwork(clients, unusedSriovDevice, sriovNetworkName, namespaces.Test, operatorNamespace, resourceName, ipam)
Expand Down Expand Up @@ -600,7 +598,7 @@ var _ = Describe("[sriov] operator", Ordered, func() {
},
Spec: sriovv1.SriovNetworkSpec{
ResourceName: resourceName,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181","routes":[{"dst":"0.0.0.0/0"}],"gateway":"10.10.10.1"}`,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}

Expand Down
42 changes: 20 additions & 22 deletions test/conformance/tests/test_sriov_operator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ var _ = Describe("[sriov] operator", func() {
},
Spec: sriovv1.SriovNetworkSpec{
ResourceName: resourceName,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181","routes":[{"dst":"0.0.0.0/0"}],"gateway":"10.10.10.1"}`,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}
err := clients.Create(context.Background(), sriovNetwork)
Expand Down Expand Up @@ -441,7 +441,7 @@ var _ = Describe("[sriov] operator", func() {
},
Spec: sriovv1.SriovNetworkSpec{
ResourceName: resourceName,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181","routes":[{"dst":"0.0.0.0/0"}],"gateway":"10.10.10.1"}`,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}
err := clients.Create(context.Background(), sriovNetwork)
Expand Down Expand Up @@ -563,9 +563,7 @@ var _ = Describe("[sriov] operator", func() {
IPAM: `{"type":"host-local",
"subnet":"10.10.10.0/24",
"rangeStart":"10.10.10.171",
"rangeEnd":"10.10.10.181",
"routes":[{"dst":"0.0.0.0/0"}],
"gateway":"10.10.10.1"}`,
"rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}

Expand Down Expand Up @@ -608,9 +606,7 @@ var _ = Describe("[sriov] operator", func() {
IPAM: `{"type":"host-local",
"subnet":"10.10.10.0/24",
"rangeStart":"10.10.10.171",
"rangeEnd":"10.10.10.181",
"routes":[{"dst":"0.0.0.0/0"}],
"gateway":"10.10.10.1"}`,
"rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}

Expand Down Expand Up @@ -657,9 +653,7 @@ var _ = Describe("[sriov] operator", func() {
IPAM: `{"type":"host-local",
"subnet":"10.10.10.0/24",
"rangeStart":"10.10.10.171",
"rangeEnd":"10.10.10.181",
"routes":[{"dst":"0.0.0.0/0"}],
"gateway":"10.10.10.1"}`,
"rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}

Expand Down Expand Up @@ -730,9 +724,7 @@ var _ = Describe("[sriov] operator", func() {
IPAM: `{"type":"host-local",
"subnet":"10.10.10.0/24",
"rangeStart":"10.10.10.171",
"rangeEnd":"10.10.10.181",
"routes":[{"dst":"0.0.0.0/0"}],
"gateway":"10.10.10.1"}`,
"rangeEnd":"10.10.10.181"}`,
MaxTxRate: &maxTxRate,
MinTxRate: &minTxRate,
NetworkNamespace: namespaces.Test,
Expand Down Expand Up @@ -766,9 +758,7 @@ var _ = Describe("[sriov] operator", func() {
IPAM: `{"type":"host-local",
"subnet":"10.10.10.0/24",
"rangeStart":"10.10.10.171",
"rangeEnd":"10.10.10.181",
"routes":[{"dst":"0.0.0.0/0"}],
"gateway":"10.10.10.1"}`,
"rangeEnd":"10.10.10.181"}`,
Vlan: 1,
VlanQoS: 2,
NetworkNamespace: namespaces.Test,
Expand Down Expand Up @@ -1310,7 +1300,7 @@ var _ = Describe("[sriov] operator", func() {
},
Spec: sriovv1.SriovNetworkSpec{
ResourceName: resourceName,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181","routes":[{"dst":"0.0.0.0/0"}],"gateway":"10.10.10.1"}`,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}

Expand Down Expand Up @@ -1602,7 +1592,7 @@ var _ = Describe("[sriov] operator", func() {
},
Spec: sriovv1.SriovNetworkSpec{
ResourceName: resourceName,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181","routes":[{"dst":"0.0.0.0/0"}],"gateway":"10.10.10.1"}`,
IPAM: `{"type":"host-local","subnet":"10.10.10.0/24","rangeStart":"10.10.10.171","rangeEnd":"10.10.10.181"}`,
NetworkNamespace: namespaces.Test,
}}

Expand Down Expand Up @@ -1856,9 +1846,17 @@ func findUnusedSriovDevices(testNode string, sriovDevices []*sriovv1.InterfaceEx
if isDefaultRouteInterface(device.Name, routes) {
continue
}
stdout, _, err = pod.ExecCommand(clients, createdPod, "ip", "link", "show", device.Name)
Expect(err).ToNot(HaveOccurred())
Expect(len(stdout)).Should(Not(Equal(0)), "Unable to query link state")
stdout, stderr, err := pod.ExecCommand(clients, createdPod, "ip", "link", "show", device.Name)
if err != nil {
fmt.Printf("Can't query link state for device [%s]: %s", device.Name, err.Error())
continue
}

if len(stdout) == 0 {
fmt.Printf("Can't query link state for device [%s]: stderr:[%s]", device.Name, stderr)
continue
}

if strings.Contains(stdout, "master ovs-system") {
continue // The interface is not active
}
Expand Down

0 comments on commit 07a7f05

Please sign in to comment.