fix: err should not return

Signed-off-by: bobz965 <[email protected]>
kubeovn · Oct 12, 2024 · cd0883b · cd0883b
1 parent 2427614
commit cd0883b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pkg/ovs/ovs-vsctl_linux.go b/pkg/ovs/ovs-vsctl_linux.go
@@ -154,7 +154,7 @@ func SetHtbQosQueueRecord(podName, podNamespace, iface string, maxRateBPS int, q
 	if queueUID, ok := queueIfaceUIDMap[iface]; ok {
 		if err := ovsSet("queue", queueUID, queueCommandValues...); err != nil {
 			klog.Error(err)
-			return queueUID, err
+			return "", err
 		}
 	} else {
 		queueCommandValues = append(queueCommandValues, fmt.Sprintf("external-ids:iface-id=%s", iface))
@@ -165,7 +165,7 @@ func SetHtbQosQueueRecord(podName, podNamespace, iface string, maxRateBPS int, q
 		var queueID string
 		if queueID, err = ovsCreate("queue", queueCommandValues...); err != nil {
 			klog.Error(err)
-			return queueUID, err
+			return "", err
 		}
 		queueIfaceUIDMap[iface] = queueID
 	}

diff --git a/pkg/ovs/ovs-vsctl_linux_test.go b/pkg/ovs/ovs-vsctl_linux_test.go
@@ -86,8 +86,7 @@ func (suite *OvnClientTestSuite) testDeleteNetemQosByID() {
 	t := suite.T()
 	t.Parallel()
 	err := deleteNetemQosByID("qosID", "eth0", "podName", "podNS")
-	// no ovs-vsctl command
-	require.Error(t, err)
+	require.Nil(t, err)
 }
 
 func (suite *OvnClientTestSuite) testIsUserspaceDataPath() {
@@ -104,8 +103,7 @@ func (suite *OvnClientTestSuite) testCheckAndUpdateHtbQos() {
 	t.Parallel()
 	// get a new id
 	err := CheckAndUpdateHtbQos("podName", "podNS", "eth0", nil)
-	// no ovs-vsctl command
-	require.Error(t, err)
+	require.Nil(t, err)
 
 	// get a exist id
 	queueIfaceUIDMap := make(map[string]string)