Skip to content

Commit

Permalink
Update error messages to show why no interface is selected
Browse files Browse the repository at this point in the history
When the SRIOV network node state is not properly initialized it can hit the error "no supported NIC is selected by the nicSelector" even though the NIC may be indeed be selected. This commit updates the error message to ensure that if the user is configuring a NIC that is supported, then the error is because the SRIOV network node state is not properly initialized.
  • Loading branch information
vrindle committed Apr 28, 2023
1 parent 9af322f commit 07b6352
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 1 deletion.
11 changes: 11 additions & 0 deletions pkg/webhook/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,12 @@ func validatePolicyForNodeStateAndPolicy(nsList *sriovnetworkv1.SriovNetworkNode

func validatePolicyForNodeState(policy *sriovnetworkv1.SriovNetworkNodePolicy, state *sriovnetworkv1.SriovNetworkNodeState, node *corev1.Node) error {
glog.V(2).Infof("validatePolicyForNodeState(): validate policy %s for node %s.", policy.GetName(), state.GetName())
interfaceSelected := false
noInterfacesSelectedLog := []string{}
for _, iface := range state.Status.Interfaces {
err := validateNicModel(&policy.Spec.NicSelector, &iface, node)
if err == nil {
interfaceSelected = true
if policy.GetName() != constants.DefaultPolicyName && policy.Spec.NumVfs == 0 {
return fmt.Errorf("numVfs(%d) in CR %s is not allowed", policy.Spec.NumVfs, policy.GetName())
}
Expand All @@ -236,6 +239,14 @@ func validatePolicyForNodeState(policy *sriovnetworkv1.SriovNetworkNodePolicy, s
if policy.Spec.VdpaType == constants.VdpaTypeVirtio && iface.Vendor != MellanoxID {
return fmt.Errorf("vendor(%s) in CR %s not supported for virtio-vdpa", iface.Vendor, policy.GetName())
}
} else {
errorMessage := fmt.Sprintf("Interface: %s was not selected, since NIC model could not be validated due to the following error: %s \n", iface.Name, err)
noInterfacesSelectedLog = append(noInterfacesSelectedLog, errorMessage)
}
}
if !interfaceSelected {
for _, interfaceAndError := range noInterfacesSelectedLog {
glog.Infof("%s", interfaceAndError)
}
}
return nil
Expand Down
42 changes: 41 additions & 1 deletion pkg/webhook/validate_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package webhook

import (
"bytes"
"flag"
"fmt"
"io"
"os"
"testing"

Expand All @@ -16,6 +19,33 @@ import (
constants "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/consts"
)

func captureStderr(f func()) (string, error) {
old := os.Stderr // keep backup of the real stderr
r, w, err := os.Pipe()
if err != nil {
return "", err
}
os.Stderr = w

outC := make(chan string)
// copy the output in a separate goroutine so printing can't block indefinitely
go func() {
var buf bytes.Buffer
io.Copy(&buf, r)
outC <- buf.String()
}()

// calling function which stderr we are going to capture:
flag.Set("alsologtostderr", "true")
f()

// back to normal state
w.Close()
flag.Set("alsologtodtderr", "false")
os.Stderr = old // restoring the real stderr
return <-outC, nil
}

func TestMain(m *testing.M) {
NicIDMap = []string{
"8086 158a 154c", // I40e XXV710
Expand Down Expand Up @@ -524,6 +554,11 @@ func TestValidatePolicyForNodeStateWithInvalidDevice(t *testing.T) {
kubeclient = kubernetes.NewForConfigOrDie(cfg)
err = validatePolicyForNodeState(policy, state, NewNode())
g.Expect(err).NotTo(HaveOccurred())
stdErr, logsProperly := captureStderr(func() {
validatePolicyForNodeState(policy, state, NewNode())
})
g.Expect(stdErr).Should(ContainSubstring("selector device ID: is not equal to the interface device ID: 8086"))
g.Expect(logsProperly).To(BeNil())
}

func TestValidatePolicyForNodeStateWithInvalidPfName(t *testing.T) {
Expand All @@ -542,9 +577,14 @@ func TestValidatePolicyForNodeStateWithInvalidPfName(t *testing.T) {
ResourceName: "p0",
},
}
g := NewGomegaWithT(t)
err := validatePolicyForNodeState(policy, state, NewNode())
g := NewGomegaWithT(t)
g.Expect(err).NotTo(HaveOccurred())
stdErr, logsProperly := captureStderr(func() {
validatePolicyForNodeState(policy, state, NewNode())
})
g.Expect(stdErr).Should(ContainSubstring("interface name: 0000:86:00.0 not found in physical function names"))
g.Expect(logsProperly).To(BeNil())
}

func TestValidatePolicyForNodeStateWithValidPfName(t *testing.T) {
Expand Down

0 comments on commit 07b6352

Please sign in to comment.