fix ut

pkg/controller/node.go

@@ -666,19 +666,18 @@ func (c *Controller) checkGatewayReady() error {
 
 func (c *Controller) cleanDuplicatedChassis(node *v1.Node) error {
 	// if multi chassis has the same node name, delete all of them
-	chassises, err := c.OVNSbClient.GetAllChassisByHost(node.Name)
-	if err != nil {
-		klog.Errorf("failed to list chassis %v", err)
-		return err
+	var err error
+	if _, err := c.OVNSbClient.GetChassisByHost(node.Name); err == nil {
+		return nil
 	}
-	if len(*chassises) > 1 {
-		klog.Warningf("node %s has multiple chassis", node.Name)
+	klog.Errorf("failed to get chassis for node %s: %v", node.Name, err)
+	if errors.Is(err, ovs.ErrOneNodeMultiChassis) {
 		if err := c.OVNSbClient.DeleteChassisByHost(node.Name); err != nil {
 			klog.Errorf("failed to delete chassis for node %s: %v", node.Name, err)
 			return err
 		}
 	}
-	return nil
+	return err
 }
 
 func (c *Controller) retryDelDupChassis(attempts, sleep int, f func(node *v1.Node) error, node *v1.Node) (err error) {

pkg/ovs/interface.go

@@ -257,7 +257,6 @@ type Common interface {
 type Chassis interface {
 	DeleteChassis(chassisName string) error
 	DeleteChassisByHost(node string) error
-	GetAllChassisByHost(nodeName string) (*[]ovnsb.Chassis, error)
 	GetChassisByHost(nodeName string) (*ovnsb.Chassis, error)
 	GetChassis(chassisName string, ignoreNotFound bool) (*ovnsb.Chassis, error)
 	GetKubeOvnChassisses() (*[]ovnsb.Chassis, error)

pkg/ovs/ovn-nb-suite_test.go

@@ -31,6 +31,7 @@ type OvnClientTestSuite struct {
 	ovnSBClient *OVNSbClient
 
 	failedOvnNBClient *OVNNbClient
+	failedOvnSBClient *OVNSbClient
 	ovnLegacyClient   *LegacyClient
 
 	ovsSocket string
@@ -40,6 +41,10 @@ func emptyNbDatabaseModel() (model.ClientDBModel, error) {
 	return model.NewClientDBModel("OVN_Northbound", map[string]model.Model{})
 }
 
+func emptySbDatabaseModel() (model.ClientDBModel, error) {
+	return model.NewClientDBModel("OVN_Southbound", map[string]model.Model{})
+}
+
 func (suite *OvnClientTestSuite) SetupSuite() {
 	fmt.Println("set up ovn client test suite")
 	// setup ovn nb client schema
@@ -73,6 +78,21 @@ func (suite *OvnClientTestSuite) SetupSuite() {
 
 	// setup ovn sb client
 	sbClientSchema := ovnsb.Schema()
+
+	// setup failed case ovn sb client
+	emptySbDBModel, err := emptySbDatabaseModel()
+	require.NoError(suite.T(), err)
+
+	fakeSBServer, sbSock1 := newOVSDBServer(suite.T(), "fake-sb", emptySbDBModel, sbClientSchema)
+	sbEndpoint1 := fmt.Sprintf("unix:%s", sbSock1)
+	require.FileExists(suite.T(), sbSock1)
+	failedOvnSBClient, err := newOvnSbClient(suite.T(), sbEndpoint1, 10)
+	require.NoError(suite.T(), err)
+	suite.failedOvnSBClient = failedOvnSBClient
+	// close the server to simulate the failed case
+	fakeSBServer.Close()
+	require.NoFileExists(suite.T(), sbSock1)
+
 	sbClientDBModel, err := ovnsb.FullDatabaseModel()
 	require.NoError(suite.T(), err)
 
@@ -1024,10 +1044,6 @@ func (suite *OvnClientTestSuite) Test_ListChassis() {
 	suite.testListChassis()
 }
 
-func (suite *OvnClientTestSuite) Test_GetAllChassisByHost() {
-	suite.testGetAllChassisByHost()
-}
-
 func (suite *OvnClientTestSuite) Test_GetChassisByHost() {
 	suite.testGetChassisByHost()
 }

pkg/ovs/ovn-sb-chassis.go

@@ -12,6 +12,8 @@ import (
 	"github.com/kubeovn/kube-ovn/pkg/util"
 )
 
+var ErrOneNodeMultiChassis = errors.New("OneNodeMultiChassis")
+
 func (c *OVNSbClient) UpdateChassis(chassis *ovnsb.Chassis, fields ...interface{}) error {
 	op, err := c.ovsDbClient.Where(chassis).Update(chassis, fields...)
 	if err != nil {
@@ -83,30 +85,6 @@ func (c *OVNSbClient) ListChassis() (*[]ovnsb.Chassis, error) {
 	return &css, nil
 }
 
-func (c *OVNSbClient) GetAllChassisByHost(nodeName string) (*[]ovnsb.Chassis, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), c.Timeout)
-	defer cancel()
-
-	chassisList := make([]ovnsb.Chassis, 0)
-	if err := c.ovsDbClient.WhereCache(func(chassis *ovnsb.Chassis) bool {
-		return chassis.Hostname == nodeName
-	}).List(ctx, &chassisList); err != nil {
-		klog.Error(err)
-		return nil, fmt.Errorf("failed to list Chassis with host name=%s: %w", nodeName, err)
-	}
-	if len(chassisList) == 0 {
-		err := fmt.Errorf("failed to get Chassis with with host name=%s", nodeName)
-		klog.Error(err)
-		return nil, err
-	}
-	if len(chassisList) != 1 {
-		err := fmt.Errorf("found more than one Chassis with with host name=%s", nodeName)
-		klog.Error(err)
-		return nil, err
-	}
-	return &chassisList, nil
-}
-
 func (c *OVNSbClient) GetChassisByHost(nodeName string) (*ovnsb.Chassis, error) {
 	if nodeName == "" {
 		err := errors.New("failed to get Chassis with empty hostname")
@@ -131,7 +109,7 @@ func (c *OVNSbClient) GetChassisByHost(nodeName string) (*ovnsb.Chassis, error)
 	if len(chassisList) != 1 {
 		err := fmt.Errorf("found more than one Chassis with host name=%s", nodeName)
 		klog.Error(err)
-		return nil, err
+		return nil, ErrOneNodeMultiChassis
 	}
 
 	// #nosec G602