Fix log, reuse existing function in GetNetworkScopedSwitchName.

Signed-off-by: Nadia Pinaeva <[email protected]>

Author: npinaeva

go-controller/pkg/ovn/gateway.go

@@ -354,7 +354,7 @@ func (gw *GatewayManager) createGWRouterPeerPort(nodeName string) error {
 	if gw.netInfo.TopologyType() == types.Layer2Topology {
 		node, err := gw.watchFactory.GetNode(nodeName)
 		if err != nil {
-			return fmt.Errorf("failed to fetch node %s from watch factory %w", node, err)
+			return fmt.Errorf("failed to fetch node %s from watch factory %w", node.Name, err)
 		}
 		tunnelID, err := util.ParseUDNLayer2NodeGRLRPTunnelIDs(node, gw.netInfo.GetNetworkName())
 		if err != nil {

go-controller/pkg/util/multi_network.go

@@ -709,7 +709,7 @@ func (nInfo *secondaryNetInfo) GetNetworkScopedGWRouterName(nodeName string) str
 func (nInfo *secondaryNetInfo) GetNetworkScopedSwitchName(nodeName string) string {
 	// In Layer2Topology there is just one global switch
 	if nInfo.TopologyType() == types.Layer2Topology {
-		return fmt.Sprintf("%s%s", nInfo.getPrefix(), types.OVNLayer2Switch)
+		return nInfo.GetNetworkScopedName(types.OVNLayer2Switch)
 	}
 	return nInfo.GetNetworkScopedName(nodeName)
 }