diff options
author | Hiroshi Yokoi <yokoi.hiroshi@po.ntts.co.jp> | 2015-07-15 19:53:53 +0900 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-07-31 16:26:17 +0900 |
commit | 0b4b806c06f0ee50bb1bc1b30c38399553687abd (patch) | |
tree | 6898ec9eeb21a26668012c1c7743772da7b72214 /server/fsm_test.go | |
parent | 2ad42ead02cce21cf71b3dde0731e8f5c6d4ac6a (diff) |
config: use the latest openconfig yang
Diffstat (limited to 'server/fsm_test.go')
-rw-r--r-- | server/fsm_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/server/fsm_test.go b/server/fsm_test.go index ff758253..498c35b7 100644 --- a/server/fsm_test.go +++ b/server/fsm_test.go @@ -189,7 +189,7 @@ func TestFSMHandlerOpenconfirm_HoldTimerExpired(t *testing.T) { p.fsm.conn = m // set up keepalive ticker - p.fsm.peerConfig.Timers.KeepaliveInterval = 1 + p.fsm.pConf.Timers.TimersConfig.KeepaliveInterval = 1 // set holdtime p.fsm.negotiatedHoldTime = 2 @@ -226,7 +226,7 @@ func TestFSMHandlerEstablish_HoldTimerExpired(t *testing.T) { } // set holdtime - p.fsm.peerConfig.Timers.HoldTime = 2 + p.fsm.pConf.Timers.TimersConfig.HoldTime = 2 p.fsm.negotiatedHoldTime = 2 go pushPackets() @@ -250,7 +250,7 @@ func TestFSMHandlerOpenconfirm_HoldtimeZero(t *testing.T) { p.fsm.conn = m // set up keepalive ticker - p.fsm.peerConfig.Timers.KeepaliveInterval = 1 + p.fsm.pConf.Timers.TimersConfig.KeepaliveInterval = 1 // set holdtime p.fsm.negotiatedHoldTime = 0 go h.openconfirm() @@ -284,16 +284,16 @@ func TestFSMHandlerEstablished_HoldtimeZero(t *testing.T) { } func makePeerAndHandler() (*Peer, *FSMHandler) { - globalConfig := config.Global{} - neighborConfig := config.Neighbor{} + gConf := config.Global{} + pConf := config.Neighbor{} p := &Peer{ - globalConfig: globalConfig, - config: neighborConfig, - capMap: make(map[bgp.BGPCapabilityCode]bgp.ParameterCapabilityInterface), + gConf: gConf, + conf: pConf, + capMap: make(map[bgp.BGPCapabilityCode]bgp.ParameterCapabilityInterface), } - p.fsm = NewFSM(&globalConfig, &neighborConfig) + p.fsm = NewFSM(&gConf, &pConf) incoming := make(chan *fsmMsg, 4096) p.outgoing = make(chan *bgp.BGPMessage, 4096) |