From 6626f1f9254477685e467c45c9d5ed4635637534 Mon Sep 17 00:00:00 2001
From: Daniel Czerwonk <daniel@dan-nrw.de>
Date: Fri, 29 Jun 2018 23:14:41 +0200
Subject: [PATCH] applied new net.IP to newest tests
---
protocols/bgp/server/update_sender_test.go | 37 +++++++++++-----------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/protocols/bgp/server/update_sender_test.go b/protocols/bgp/server/update_sender_test.go
index 1683c23d..1335c153 100644
--- a/protocols/bgp/server/update_sender_test.go
+++ b/protocols/bgp/server/update_sender_test.go
@@ -1,7 +1,6 @@
package server
import (
- "net"
"reflect"
"testing"
"time"
@@ -35,10 +34,10 @@ func TestSender(t *testing.T) {
},
},
pfxs: []bnet.Prefix{
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{10, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{11, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{12, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{13, 0, 0, 0})), 32),
+ bnet.NewPfx(bnet.IPv4FromOctets(10, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(11, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(12, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(13, 0, 0, 0), 32),
},
},
{
@@ -49,10 +48,10 @@ func TestSender(t *testing.T) {
},
},
pfxs: []bnet.Prefix{
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{20, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{21, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{22, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{23, 0, 0, 0})), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(20, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(21, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(22, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(23, 0, 0, 0), 8),
},
},
},
@@ -97,10 +96,10 @@ func TestSender(t *testing.T) {
},
},
pfxs: []bnet.Prefix{
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{10, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{11, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{12, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{13, 0, 0, 0})), 32),
+ bnet.NewPfx(bnet.IPv4FromOctets(10, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(11, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(12, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(13, 0, 0, 0), 32),
},
},
{
@@ -111,10 +110,10 @@ func TestSender(t *testing.T) {
},
},
pfxs: []bnet.Prefix{
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{20, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{21, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{22, 0, 0, 0})), 8),
- bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{23, 0, 0, 0})), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(20, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(21, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(22, 0, 0, 0), 8),
+ bnet.NewPfx(bnet.IPv4FromOctets(23, 0, 0, 0), 8),
},
},
},
@@ -334,7 +333,7 @@ func TestSender(t *testing.T) {
for _, test := range tests {
fsmA := newFSM2(&peer{
- addr: net.ParseIP("169.254.100.100"),
+ addr: bnet.IPv4FromOctets(169, 254, 100, 100),
rib: locRIB.New(),
importFilter: filter.NewAcceptAllFilter(),
exportFilter: filter.NewAcceptAllFilter(),
@@ -362,7 +361,7 @@ func TestSender(t *testing.T) {
for i := uint64(0); i < test.generateNLRIs; i++ {
x := i / 256
y := i - x
- pfx := bnet.NewPfx(bnet.IPv4ToUint32(net.IP([]byte{10, 0, uint8(x), uint8(y)})), 32)
+ pfx := bnet.NewPfx(bnet.IPv4FromOctets(10, 0, uint8(x), uint8(y)), 32)
updateSender.AddPath(pfx, pathPfx.path)
}
}
--
GitLab