Re-run libovsdb modelgen on LB Groups enabled OVN schema.

Signed-off-by: Dumitru Ceara <dceara@redhat.com>
dceara · Dec 2, 2021 · f895b42 · f895b42
1 parent 247aa5c
commit f895b42
Show file tree

Hide file tree

Showing 9 changed files with 166 additions and 27 deletions.
diff --git a/go-controller/pkg/nbdb/acl.go b/go-controller/pkg/nbdb/acl.go
diff --git a/go-controller/pkg/nbdb/copp.go b/go-controller/pkg/nbdb/copp.go
diff --git a/go-controller/pkg/nbdb/load_balancer_group.go b/go-controller/pkg/nbdb/load_balancer_group.go
diff --git a/go-controller/pkg/nbdb/logical_router.go b/go-controller/pkg/nbdb/logical_router.go
diff --git a/go-controller/pkg/nbdb/logical_switch.go b/go-controller/pkg/nbdb/logical_switch.go
diff --git a/go-controller/pkg/nbdb/model.go b/go-controller/pkg/nbdb/model.go
diff --git a/go-controller/pkg/ovn/master.go b/go-controller/pkg/ovn/master.go
@@ -512,7 +512,7 @@ func (oc *Controller) addNodeLogicalSwitchPort(logicalSwitchName, portName, port
 	}
 	_, err := oc.modelClient.CreateOrUpdate(opModels...)
 	if err != nil {
-		return "", fmt.Errorf("failed to add logical port %s to switch %s, error: %v", portName, logicalSwitch, err)
+		return "", fmt.Errorf("failed to add logical port %s to switch %s, error: %v", portName, logicalSwitch.Name, err)
 	}
 
 	return logicalSwitchPort.UUID, nil

diff --git a/go-controller/pkg/sbdb/logical_flow.go b/go-controller/pkg/sbdb/logical_flow.go
diff --git a/go-controller/pkg/sbdb/model.go b/go-controller/pkg/sbdb/model.go