nodemanager: don't return ErrNoVMFound if nodeID is empty

Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
kubernetes · Aug 25, 2020 · 6937c1f · 6937c1f
1 parent 2d4bde6
commit 6937c1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/cloudprovider/vsphere/instances_test.go b/pkg/cloudprovider/vsphere/instances_test.go
@@ -196,8 +196,8 @@ func TestInvalidInstance(t *testing.T) {
 	}
 
 	exists, err := instances.InstanceExistsByProviderID(ctx, providerID)
-	if err != nil {
-		t.Errorf("InstanceExistsByProviderID unexpected failure but err=%s", err)
+	if err == nil {
+		t.Errorf("InstanceExistsByProviderID expected failure, but err=nil")
 	}
 	if exists {
 		t.Error("InstanceExistsByProviderID excepted not exists")

diff --git a/pkg/common/connectionmanager/search.go b/pkg/common/connectionmanager/search.go
@@ -18,6 +18,7 @@ package connectionmanager
 
 import (
 	"context"
+	"errors"
 	"strings"
 	"sync"
 	"time"
@@ -46,7 +47,7 @@ func (f FindVM) String() string {
 func (cm *ConnectionManager) WhichVCandDCByNodeID(ctx context.Context, nodeID string, searchBy FindVM) (*VMDiscoveryInfo, error) {
 	if nodeID == "" {
 		klog.V(3).Info("WhichVCandDCByNodeID called but nodeID is empty")
-		return nil, vclib.ErrNoVMFound
+		return nil, errors.New("nodeID is empty")
 	}
 	type vmSearch struct {
 		tenantRef  string