scenario_test: update neighbor configuration

2 files changed, 67 insertions, 48 deletions

diff --git a/test/scenario_test/exabgp_test_conf/gobgpd.conf b/test/scenario_test/exabgp_test_conf/gobgpd.conf
index aa4c5d78..55c6d5a7 100644
--- a/test/scenario_test/exabgp_test_conf/gobgpd.conf
+++ b/test/scenario_test/exabgp_test_conf/gobgpd.conf
@@ -6,8 +6,13 @@
     InternalRouteDistance = 0
   [Global.Confederation]
     Identifier = 0
+  [Global.UseMultiplePaths]
+    [Global.UseMultiplePaths.Ebgp]
+      AllowMultipleAs = false
+      MaximumPaths = 0
+    [Global.UseMultiplePaths.Ibgp]
+      MaximumPaths = 0
   [Global.BgpGlobalState]
-    StartTime = 0001-01-01T00:00:00Z
 
 [[NeighborList]]
   NeighborAddress = "10.0.0.100"
@@ -17,28 +22,18 @@
   PeerType = 0
   RemovePrivateAs = 0
   RouteFlapDamping = false
-  [NeighborList.RouteSelectionOptions]
-    AlwaysCompareMed = false
-    IgnoreAsPathLength = false
-    ExternalCompareRouterId = false
-    AdvertiseInactiveRoutes = false
-    EnableAigp = false
-  [NeighborList.UseMultiplePaths]
-    [NeighborList.UseMultiplePaths.Ebgp]
-      AllowMultipleAs = false
-      MaximumPaths = 0
-    [NeighborList.UseMultiplePaths.Ibgp]
-      MaximumPaths = 0
-    [NeighborList.UseMultiplePaths.Eibgp]
-      MaximumPaths = 0
+  SendCommunity = 0
   [NeighborList.GracefulRestart]
     RestartTime = 0
     StaleRoutesTime = 0.0
   [NeighborList.ApplyPolicy]
+    DefaultImportPolicy = 0
+    DefaultExportPolicy = 0
   [NeighborList.Timers]
     ConnectRetry = 0.0
-    HoldTime = 0.0
-    KeepaliveInterval = 0.0
+    HoldTime = 30.0
+    IdleHoldTimeAfterReset = 10.0
+    KeepaliveInterval = 10.0
     MinimumAdvertisementInterval = 0.0
     SendUpdateDelay = 0.0
   [NeighborList.EbgpMultihop]
@@ -46,19 +41,31 @@
   [NeighborList.RouteReflector]
     RouteReflectorClusterId = 0
     RouteReflectorClient = false
+  [NeighborList.RouteServer]
+    RouteServerClient = true
   [NeighborList.BgpLoggingOptions]
     LogNeighborStateChanges = false
   [NeighborList.TransportOptions]
     TcpMss = 0
     MtuDiscovery = false
-    PassiveMode = false
+    PassiveMode = true
+  [NeighborList.ErrorHandling]
+    TreatAsWithdraw = false
+  [NeighborList.AsPathOptions]
+    AllowOwnAs = false
+    ReplacePeerAs = false
+  [NeighborList.AddPaths]
+    Receive = false
+    SendMax = 0
   [NeighborList.BgpNeighborCommonState]
     State = 0
-    Uptime = 0001-01-01T00:00:00Z
+    Uptime = 0
+    Downtime = 0
     OpenIn = 0
     OpenOut = 0
     UpdateIn = 0
     UpdateOut = 0
+    UpdateRecvTime = 0
     KeepaliveIn = 0
     KeepaliveOut = 0
     NotifyIn = 0
@@ -67,10 +74,12 @@
     RefreshOut = 0
     DynamicCapIn = 0
     DynamicCapOut = 0
+    DiscardedIn = 0
+    DiscardedOut = 0
     TotalIn = 0
     TotalOut = 0
     EstablishedCount = 0
-    DroppedCount = 0
+    Flops = 0
 
 [[NeighborList]]
   NeighborAddress = "10.0.0.1"
@@ -80,28 +89,18 @@
   PeerType = 0
   RemovePrivateAs = 0
   RouteFlapDamping = false
-  [NeighborList.RouteSelectionOptions]
-    AlwaysCompareMed = false
-    IgnoreAsPathLength = false
-    ExternalCompareRouterId = false
-    AdvertiseInactiveRoutes = false
-    EnableAigp = false
-  [NeighborList.UseMultiplePaths]
-    [NeighborList.UseMultiplePaths.Ebgp]
-      AllowMultipleAs = false
-      MaximumPaths = 0
-    [NeighborList.UseMultiplePaths.Ibgp]
-      MaximumPaths = 0
-    [NeighborList.UseMultiplePaths.Eibgp]
-      MaximumPaths = 0
+  SendCommunity = 0
   [NeighborList.GracefulRestart]
     RestartTime = 0
     StaleRoutesTime = 0.0
   [NeighborList.ApplyPolicy]
+    DefaultImportPolicy = 0
+    DefaultExportPolicy = 0
   [NeighborList.Timers]
     ConnectRetry = 0.0
-    HoldTime = 0.0
-    KeepaliveInterval = 0.0
+    HoldTime = 30.0
+    IdleHoldTimeAfterReset = 10.0
+    KeepaliveInterval = 10.0
     MinimumAdvertisementInterval = 0.0
     SendUpdateDelay = 0.0
   [NeighborList.EbgpMultihop]
@@ -109,19 +108,31 @@
   [NeighborList.RouteReflector]
     RouteReflectorClusterId = 0
     RouteReflectorClient = false
+  [NeighborList.RouteServer]
+    RouteServerClient = true
   [NeighborList.BgpLoggingOptions]
     LogNeighborStateChanges = false
   [NeighborList.TransportOptions]
     TcpMss = 0
     MtuDiscovery = false
-    PassiveMode = false
+    PassiveMode = true
+  [NeighborList.ErrorHandling]
+    TreatAsWithdraw = false
+  [NeighborList.AsPathOptions]
+    AllowOwnAs = false
+    ReplacePeerAs = false
+  [NeighborList.AddPaths]
+    Receive = false
+    SendMax = 0
   [NeighborList.BgpNeighborCommonState]
     State = 0
-    Uptime = 0001-01-01T00:00:00Z
+    Uptime = 0
+    Downtime = 0
     OpenIn = 0
     OpenOut = 0
     UpdateIn = 0
     UpdateOut = 0
+    UpdateRecvTime = 0
     KeepaliveIn = 0
     KeepaliveOut = 0
     NotifyIn = 0
@@ -130,11 +141,13 @@
     RefreshOut = 0
     DynamicCapIn = 0
     DynamicCapOut = 0
+    DiscardedIn = 0
+    DiscardedOut = 0
     TotalIn = 0
     TotalOut = 0
     EstablishedCount = 0
-    DroppedCount = 0
+    Flops = 0
 
-[Policy]
-  [Policy.DefinedSets]
-  [Policy.PolicyDefinitions]
+[ApplyPolicy]
+  DefaultImportPolicy = 0
+  DefaultExportPolicy = 0
diff --git a/test/scenario_test/quagga-rsconfig.go b/test/scenario_test/quagga-rsconfig.go
index c9c92f94..83b6e663 100644
--- a/test/scenario_test/quagga-rsconfig.go
+++ b/test/scenario_test/quagga-rsconfig.go
@@ -92,9 +92,12 @@ func create_config_files(nr int, outputDir string, IPVersion string) {
 
 	for i := 1; i < nr+1; i++ {
 		c := config.Neighbor{
-			PeerAs:          65000 + uint32(i),
-			NeighborAddress: net.ParseIP(fmt.Sprintf("%s%d", baseNeighborAddress[IPVersion], i)),
-			AuthPassword:    fmt.Sprintf("hoge%d", i),
+			PeerAs:           65000 + uint32(i),
+			NeighborAddress:  net.ParseIP(fmt.Sprintf("%s%d", baseNeighborAddress[IPVersion], i)),
+			AuthPassword:     fmt.Sprintf("hoge%d", i),
+			RouteServer:      config.RouteServer{RouteServerClient: true},
+			TransportOptions: config.TransportOptions{PassiveMode: true},
+			Timers:           config.Timers{HoldTime: 30, KeepaliveInterval: 10, IdleHoldTimeAfterReset: 10},
 		}
 		gobgpConf.NeighborList = append(gobgpConf.NeighborList, c)
 		q := NewQuaggaConfig(i, &gobgpConf.Global, &c, net.ParseIP(serverAddress[IPVersion]))
@@ -130,9 +133,12 @@ func append_config_files(ar int, outputDir string, IPVersion string) {
 		},
 	}
 	c := config.Neighbor{
-		PeerAs:          65000 + uint32(ar),
-		NeighborAddress: net.ParseIP(fmt.Sprintf("%s%d", baseNeighborAddress[IPVersion], ar)),
-		AuthPassword:    fmt.Sprintf("hoge%d", ar),
+		PeerAs:           65000 + uint32(ar),
+		NeighborAddress:  net.ParseIP(fmt.Sprintf("%s%d", baseNeighborAddress[IPVersion], ar)),
+		AuthPassword:     fmt.Sprintf("hoge%d", ar),
+		RouteServer:      config.RouteServer{RouteServerClient: true},
+		TransportOptions: config.TransportOptions{PassiveMode: true},
+		Timers:           config.Timers{HoldTime: 30, KeepaliveInterval: 10, IdleHoldTimeAfterReset: 10},
 	}
 	q := NewQuaggaConfig(ar, &gobgpConf.Global, &c, net.ParseIP(serverAddress[IPVersion]))
 	os.Mkdir(fmt.Sprintf("%s/q%d", outputDir, ar), 0755)