Added support for "routeserver_info_types=Route Server,NSP" in ini-files,

that will consider ingother network types for routeserver, while trying to keep the default behavior (until now)

Author: ipcjk

Readme.md

@@ -293,6 +293,13 @@ Setting wildcard to enableAll will configure all neighbors from the Exchange, no
 good for configuration testing, benchmarking, and history ...! Be sure to set the _-myasn_ parameter on start, so that
 neighbor statements for your network will be omitted.
 
+### routeserver info types
+
+Some IXs have the network type set to "NSP", in which case the route servers are not recognized despite a correct ASN. This allows you to override the info types with a comma-separated list for the IX. For example:
+
+- routeserver_info_types=NSP,Route Server 
+
+
 #### additional configuration
 
 You can use this code to generate peer-group configuration or anything else you want to add before the single peer

inireader/iniread.go

@@ -3,12 +3,13 @@ package inireader
 import (
 	"bufio"
 	"fmt"
-	"github.com/ipcjk/ixgen/ixtypes"
 	"io"
 	"log"
 	"regexp"
 	"strconv"
 	"strings"
+
+	"github.com/ipcjk/ixgen/ixtypes"
 )
 
 var splitBy = `\s+`
@@ -28,6 +29,7 @@ var PossibleOptions = map[string]bool{
 	"routeserver_prefixes6":  true,
 	"rs_asn":                 true,
 	"wildcard_prefix_filter": true,
+	"routeserver_info_types": true,
 }
 
 const (
@@ -103,6 +105,9 @@ func ReadPeeringConfig(r io.Reader) ixtypes.IXs {
 			if ix.Options[currentHead]["peer_group"] != "" {
 				ix.PeeringGroups[string(ix.Options[currentHead]["peer_group"])] = true
 			}
+			if ix.Options[currentHead]["routeserver_info_types"] != "" {
+				ix.PeeringGroups[string(ix.Options[currentHead]["routeserver_info_types"])] = true
+			}
 		} else if line != "" && whichSection == peers {
 			Peer := ParsePeerLine(line, lineNum)
 			if Peer.Active == true {

inireader_test.go

@@ -1,9 +1,10 @@
 package main
 
 import (
+	"testing"
+
 	"github.com/ipcjk/ixgen/inireader"
 	"github.com/ipcjk/ixgen/ixtypes"
-	"testing"
 )
 
 func TestParsePeerFunction(t *testing.T) {
@@ -62,6 +63,7 @@ func TestExchangeOption(t *testing.T) {
 	inireader.ParseOptionLine("routeserver_prefixes6=400", ixConfig, "testIX")
 	inireader.ParseOptionLine("rs_asn=6695", ixConfig, "testIX")
 	inireader.ParseOptionLine("wildcard_prefix_filter=1", ixConfig, "testIX")
+	inireader.ParseOptionLine("routeserver_info_types=Route Server,NSP", ixConfig, "testIX")
 
 	/* Check that we covered all cases from inireader */
 	for k := range inireader.PossibleOptions {
@@ -103,4 +105,8 @@ func TestExchangeOption(t *testing.T) {
 	if ixConfig["testIX"]["wildcard_prefix_filter"] != "1" {
 		t.Error("Prefix filter options for wildcards peers is not set")
 	}
+
+	if ixConfig["testIX"]["routeserver_info_types"] != "Route Server,NSP" {
+		t.Error("Routeserver info types are wrong")
+	}
 }

ixworkers/ixworkers.go

@@ -5,6 +5,8 @@ import (
 	"strconv"
 	"sync"
 
+	"strings"
+
 	"github.com/ipcjk/ixgen/bgpqworkers"
 	"github.com/ipcjk/ixgen/ixtypes"
 	"github.com/ipcjk/ixgen/peeringdb"
@@ -18,6 +20,16 @@ func isTrue(value string) bool {
 	return false
 }
 
+/* helper function to check if a string slice contains a value */
+func contains(slice []string, value string) bool {
+	for _, item := range slice {
+		if item == value {
+			return true
+		}
+	}
+	return false
+}
+
 func WorkerMergePeerConfiguration(exchanges ixtypes.IXs, apiServiceURL string, apiKey string, exchangeOnly string, myASN int64, prefixFactor float64) ixtypes.IXs {
 	var wg sync.WaitGroup
 	peerDB := peeringdb.Peeringdb(apiServiceURL, apiKey)
@@ -54,6 +66,16 @@ func WorkerMergePeerConfiguration(exchanges ixtypes.IXs, apiServiceURL string, a
 				return
 			}
 
+			/* Parse routeserver_info_types from config into a map for fast lookup */
+			rsInfoTypesMap := make(map[string]bool)
+			rsInfoTypesMap["Route Server"] = true // default
+
+			if rsInfoTypes, rsInfoTypesOk := exchanges[i].Options[exchanges[i].IxName]["routeserver_info_types"]; rsInfoTypesOk && string(rsInfoTypes) != "" {
+				for _, rsInfoType := range strings.Split(string(rsInfoTypes), ",") {
+					rsInfoTypesMap[strings.TrimSpace(rsInfoType)] = true
+				}
+			}
+
 			/* peering DB api change, pull asns into a local query list,
 			respect other threads if necessary */
 			for _, peer := range myPeers.Data {
@@ -129,7 +151,38 @@ func WorkerMergePeerConfiguration(exchanges ixtypes.IXs, apiServiceURL string, a
 					continue
 				}
 
-				if peerDbNetwork.InfoType == "Route Server" {
+				/* Check both info_type (legacy) and info_types (array) for configured route server types */
+				isRouteServerType := false
+				hasRouteServerType := false
+
+				// Check InfoTypes array
+				for _, infoType := range peerDbNetwork.InfoTypes {
+					if rsInfoTypesMap[infoType] {
+						isRouteServerType = true
+						if infoType == "Route Server" {
+							hasRouteServerType = true
+						}
+					}
+				}
+
+				// Check legacy InfoType string
+				if rsInfoTypesMap[peerDbNetwork.InfoType] {
+					isRouteServerType = true
+					if peerDbNetwork.InfoType == "Route Server" {
+						hasRouteServerType = true
+					}
+				}
+
+				// Legacy behavior: if "Route Server" type found and rs_asn configured, validate ASN match
+				if hasRouteServerType && rsnOk && peerASN != string(rsnASN) {
+					log.Printf("Ignoring route-server advertised from ASN %s, but IX ASN shall be %s\n", peerASN, rsnASN)
+					continue
+				}
+
+				// Set as route server only if type matches AND rs_asn matches (if configured)
+				isRouteServer := isRouteServerType && (!rsnOk || peerASN == string(rsnASN))
+
+				if isRouteServer {
 					rgroup, rgOk := exchanges[i].Options[exchanges[i].IxName]["routeserver_group"]
 					rgroup6, rg6Ok := exchanges[i].Options[exchanges[i].IxName]["routeserver_group6"]
 					infoprefixes4, rprefixOk := exchanges[i].Options[exchanges[i].IxName]["routeserver_prefixes"]
@@ -184,11 +237,10 @@ func WorkerMergePeerConfiguration(exchanges ixtypes.IXs, apiServiceURL string, a
 						rsPeer.InfoPrefixes6 = int64(prefixFactor * float64(rsPeer.InfoPrefixes6))
 					}
 
-					if rsAuto && rsnOk && peerASN != string(rsnASN) {
-						log.Printf("Ignoring route-server advertised from ASN %s, but IX ASN shall be %s\n", peerASN, rsnASN)
-					} else if rsAuto {
+					if rsAuto {
 						exchanges[i].PeersReady = append(exchanges[i].PeersReady, rsPeer)
 					}
+					// continue to the next peer
 					continue
 				}
 				_, ok := exchanges[i].PeersINI[exchanges[i].IxName][peerASN]

peergen_test.go

@@ -4,14 +4,15 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/json"
-	"github.com/ipcjk/ixgen/ixtypes"
-	"github.com/ipcjk/ixgen/peergen"
 	"html/template"
 	"io"
 	"log"
 	"net"
 	"strings"
 	"testing"
+
+	"github.com/ipcjk/ixgen/ixtypes"
+	"github.com/ipcjk/ixgen/peergen"
 )
 
 func TestExtremeNetworksIX(t *testing.T) {

peeringdb/types.go

@@ -105,6 +105,7 @@ type NetData struct {
 	InfoScope                string    `json:"info_scope"`
 	InfoTraffic              string    `json:"info_traffic"`
 	InfoType                 string    `json:"info_type"`
+	InfoTypes                []string  `json:"info_types"`
 	InfoUnicast              bool      `json:"info_unicast"`
 	IrrAsSet                 string    `json:"irr_as_set"`
 	LookingGlass             string    `json:"looking_glass"`

peeringdb_test.go

@@ -1,11 +1,13 @@
 package main
 
 import (
-	"github.com/ipcjk/ixgen/libapiserver"
-	"github.com/ipcjk/ixgen/peeringdb"
 	"net/http"
 	"os"
+	"strconv"
 	"testing"
+
+	"github.com/ipcjk/ixgen/libapiserver"
+	"github.com/ipcjk/ixgen/peeringdb"
 )
 
 var apiserverDbTest *libapiserver.Apiserver
@@ -161,11 +163,69 @@ func TestGetPeersOnIX(t *testing.T) {
 
 }
 
-func mini(a int, b int) int {
-	if a <= b {
-		return a
+func TestGetRouteServersOnIX(t *testing.T) {
+	peerDB := peeringdb.Peeringdb("http://"+apiserverDbTest.AddrPort+"/api", apikey)
+	ix, err := peerDB.SearchIXByIxName("DE-CIX Frankfurt")
+
+	if err != nil {
+		t.Errorf("Cant search by the IxName: %s", err)
+	}
+
+	if ix.Data[0].Name != "DE-CIX Frankfurt" {
+		t.Error("Cant find the DE-CIX Frankfurt, something wrong the data-set!")
+	}
+
+	// Route Server ASN for DE-CIX Frankfurt is 6695
+	var decixRsAsn int64 = 6695
+
+	// get all peers on DE-CIX Frankfurt
+	myPeers, err := peerDB.GetPeersOnIX(ix.Data[0].Name, strconv.FormatInt(ix.Data[0].ID, 10), false)
+	if err != nil {
+		t.Errorf("Cant query the API for peers on IX: %s", err)
+	}
+
+	if len(myPeers.Data) == 0 {
+		t.Error("No peers found for DE-CIX Frankfurt")
+	}
+
+	for _, peer := range myPeers.Data {
+		// check if the peer is a route server
+		if peer.Asn == decixRsAsn {
+			// Get NetData to access InfoType, InfoTypes, and prefix information
+			netData, err := peerDB.GetNetworkByAsN(peer.Asn)
+			if err != nil {
+				t.Errorf("Cant get network data for ASN %d: %s", peer.Asn, err)
+				continue
+			}
+
+			if len(netData.Data) == 0 {
+				t.Errorf("No network data found for ASN %d", peer.Asn)
+				continue
+			}
+
+			/* Check both info_type (legacy) and info_types (array) for Route Server on DE-CIX Frankfurt
+			maybe need convert this into a function to avoid code duplication*/
+			var isLegacyRouteServer bool = false
+			var isArrayRouteServer bool = false
+			if netData.Data[0].InfoType == "Route Server" {
+				isLegacyRouteServer = true
+			}
+			if contains(netData.Data[0].InfoTypes, "Route Server") {
+				isArrayRouteServer = true
+			}
+			if !isLegacyRouteServer {
+				t.Logf("Expected Route Server for DE-CIX Frankfurt is not a Route Server: %s", peer.Name)
+			}
+			if !isArrayRouteServer {
+				t.Logf("Array Field is not a possible Route Server for DE-CIX Frankfurt: %s", peer.Name)
+			}
+
+			if !isLegacyRouteServer && !isArrayRouteServer {
+				t.Logf("Expected Route Server for DE-CIX Frankfurt is not a Route Server: %s", peer.Name)
+			}
+
+		}
 	}
-	return b
 }
 
 func TestSplitASN(t *testing.T) {
@@ -184,6 +244,13 @@ func TestSplitASN(t *testing.T) {
 
 }
 
+func mini(a int, b int) int {
+	if a <= b {
+		return a
+	}
+	return b
+}
+
 func TestGetASNsbyList(t *testing.T) {
 	asnList := []string{"196922", "3356"}
 
@@ -204,3 +271,13 @@ func TestGetASNsbyList(t *testing.T) {
 	}
 
 }
+
+/* helper function to check if a string slice contains a value */
+func contains(slice []string, value string) bool {
+	for _, item := range slice {
+		if item == value {
+			return true
+		}
+	}
+	return false
+}