luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Added a test

This commit is contained in:
Diptanu Choudhury 2017-04-08 13:43:29 -07:00
parent eed4a9124e
commit 45ad1298e6
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/fingerprint/network.go
View File

@ -95,6 +95,7 @@ func (f *NetworkFingerprint) Fingerprint(cfg *config.Config, node *structs.Node)
f.logger.Printf("[DEBUG] fingerprint.network: Detected interface %v with IP: %v", intf.Name, nwResource.IP) f.logger.Printf("[DEBUG] fingerprint.network: Detected interface %v with IP: %v", intf.Name, nwResource.IP)
} }
// Deprectaed, setting the first IP as unique IP for the node
if len(nwResources) > 0 { if len(nwResources) > 0 {
node.Attributes["unique.network.ip-address"] = nwResources[0].IP node.Attributes["unique.network.ip-address"] = nwResources[0].IP
} }

17
client/fingerprint/network_test.go
View File

@ -126,8 +126,9 @@ func (n *NetworkInterfaceDetectorMultipleInterfaces) Addrs(intf *net.Interface)
if intf.Name == "eth0" { if intf.Name == "eth0" {
_, ipnet1, _ := net.ParseCIDR("100.64.0.11/10") _, ipnet1, _ := net.ParseCIDR("100.64.0.11/10")
_, ipnet2, _ := net.ParseCIDR("2005:DB6::/48") _, ipnet2, _ := net.ParseCIDR("2001:0db8:85a3:0000:0000:8a2e:0370:7334/64")
return []net.Addr{ipnet1, ipnet2}, nil ipAddr, _ := net.ResolveIPAddr("ip6", "fe80::140c:9579:8037:f565")
return []net.Addr{ipnet1, ipnet2, ipAddr}, nil
} }
if intf.Name == "eth1" { if intf.Name == "eth1" {
@ -307,4 +308,16 @@ func TestNetworkFingerPrint_excludelo_down_interfaces(t *testing.T) {
if net.MBits == 0 { if net.MBits == 0 {
t.Fatal("Expected Network Resource to have a non-zero bandwith") t.Fatal("Expected Network Resource to have a non-zero bandwith")
} }
// Test the CIDR of the IPs
if node.Resources.Networks[0].CIDR != "100.64.0.0/32" {
t.Fatalf("bad CIDR: %v", node.Resources.Networks[0].CIDR)
}
if node.Resources.Networks[1].CIDR != "2001:db8:85a3::/128" {
t.Fatalf("bad CIDR: %v", node.Resources.Networks[1].CIDR)
}
// Ensure that the link local address isn't fingerprinted
if len(node.Resources.Networks) != 2 {
t.Fatalf("bad number of IPs %v", len(node.Resources.Networks))
}
} }