0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork/osl: clean up newInfo() a bit

Browse source 
Use struct-literals in some places to make it slightly more visible
what we're creating where.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-08-03 00:04:27 +02:00
parent 0da721ec38
commit 972d80b596
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
libnetwork/osl/sandbox_linux_test.go
View file

@ -58,66 +58,66 @@ func newKey(t *testing.T) (string, error) {
func newInfo(t *testing.T, hnd *netlink.Handle) (Sandbox, error) {
t.Helper()
veth := &netlink.Veth{
err := hnd.LinkAdd(&netlink.Veth{
LinkAttrs: netlink.LinkAttrs{Name: vethName1, TxQLen: 0},
PeerName: vethName2,
}
if err := hnd.LinkAdd(veth); err != nil {
})
if err != nil {
return nil, err
}
// Store the sandbox side pipe interface
// This is needed for cleanup on DeleteEndpoint()
intf1 := &nwIface{}
intf1.srcName = vethName2
intf1.dstName = sboxIfaceName
ip4, addr, err := net.ParseCIDR("192.168.1.100/24")
if err != nil {
return nil, err
}
intf1.address = addr
intf1.address.IP = ip4
addr.IP = ip4
ip6, addrv6, err := net.ParseCIDR("fe80::2/64")
if err != nil {
return nil, err
}
intf1.addressIPv6 = addrv6
intf1.addressIPv6.IP = ip6
addrv6.IP = ip6
_, route, err := net.ParseCIDR("192.168.2.1/32")
if err != nil {
return nil, err
}
intf1.routes = []*net.IPNet{route}
intf2 := &nwIface{}
intf2.srcName = "testbridge"
intf2.dstName = sboxIfaceName
intf2.bridge = true
veth = &netlink.Veth{
LinkAttrs: netlink.LinkAttrs{Name: vethName3, TxQLen: 0},
PeerName: vethName4,
// Store the sandbox side pipe interface
// This is needed for cleanup on DeleteEndpoint()
intf1 := &nwIface{
srcName: vethName2,
dstName: sboxIfaceName,
address: addr,
addressIPv6: addrv6,
routes: []*net.IPNet{route},
}
if err := hnd.LinkAdd(veth); err != nil {
intf2 := &nwIface{
srcName: "testbridge",
dstName: sboxIfaceName,
bridge: true,
}
err = hnd.LinkAdd(&netlink.Veth{
LinkAttrs: netlink.LinkAttrs{Name: vethName3, TxQLen: 0},
PeerName: vethName4,
})
if err != nil {
return nil, err
}
intf3 := &nwIface{}
intf3.srcName = vethName4
intf3.dstName = sboxIfaceName
intf3.master = "testbridge"
intf3 := &nwIface{
srcName: vethName4,
dstName: sboxIfaceName,
master: "testbridge",
}
info := &networkNamespace{iFaces: []*nwIface{intf1, intf2, intf3}}
info.gw = net.ParseIP("192.168.1.1")
info.gwv6 = net.ParseIP("fe80::1")
return info, nil
return &networkNamespace{
iFaces: []*nwIface{intf1, intf2, intf3},
gw: net.ParseIP("192.168.1.1"),
gwv6: net.ParseIP("fe80::1"),
}, nil
}
func verifySandbox(t *testing.T, s Sandbox, ifaceSuffixes []string) {