Merge pull request #15023 from dcbw/ofport-failure-logging

Merged by openshift-bot

Author: OpenShift Bot

pkg/util/ovs/ovs.go

@@ -177,7 +177,7 @@ func (ovsif *ovsExec) GetOFPort(port string) (int, error) {
 	}
 	ofport, err := strconv.Atoi(ofportStr)
 	if err != nil {
-		return -1, fmt.Errorf("Could not parse allocated ofport %q: %v", ofportStr, err)
+		return -1, fmt.Errorf("could not parse allocated ofport %q: %v", ofportStr, err)
 	}
 	return ofport, nil
 }
@@ -198,8 +198,11 @@ func (ovsif *ovsExec) AddPort(port string, ofportRequest int, properties ...stri
 		return -1, err
 	}
 	ofport, err := ovsif.GetOFPort(port)
+	if err != nil {
+		return -1, fmt.Errorf("failed to get %q OVS port: %v", port, err)
+	}
 	if ofportRequest > 0 && ofportRequest != ofport {
-		return -1, fmt.Errorf("Allocated ofport (%d) did not match request (%d)", ofport, ofportRequest)
+		return -1, fmt.Errorf("allocated ofport (%d) did not match request (%d)", ofport, ofportRequest)
 	}
 	return ofport, nil
 }

pkg/util/ovs/ovs_test.go

@@ -190,7 +190,7 @@ func TestAddPort(t *testing.T) {
 	if err == nil {
 		t.Fatalf("Unexpectedly failed to get error")
 	}
-	if err.Error() != "Allocated ofport (3) did not match request (5)" {
+	if err.Error() != "allocated ofport (3) did not match request (5)" {
 		t.Fatalf("Got wrong error: %v", err)
 	}
 	ensureTestResults(t, fexec)