Changes to serverAnnotator to support project-decorated/flat hostnames. (#25)

* Changes to serverAnnotator to support project-decorated/flat hostnames.

* Switches to using package m-lab/go/host instead of using a custom regex to parse hostname.

* Removes unused import regexp.

* Returns nil,err if parsing the hostname fails, not using rtx.Must which halts execution.

* Assigns host.Parse() to h instead of host. to avoid assigning to a variable named the same as a package.

* Changes invalid M-Lab site name 'four0' to 'six02' so that tests can pass. 'four02' violates the new regexp in m-lab/go/host.

Author: nkinkade

siteannotator/server.go

@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"errors"
 	"net"
-	"strings"
 	"sync"
 
+	"github.com/m-lab/go/host"
 	"github.com/m-lab/go/rtx"
 
 	"github.com/m-lab/tcp-info/inetdiag"
@@ -110,15 +110,14 @@ func (g *siteAnnotator) load(ctx context.Context) (*annotator.ServerAnnotations,
 	if err != nil {
 		return nil, err
 	}
-	f := strings.Split(g.hostname, ".")
-	if len(f) < 2 {
-		return nil, ErrHostnameNotFound
+	h, err := host.Parse(g.hostname)
+	if err != nil {
+		return nil, err
 	}
-	site := f[1]
 	for i := range s {
-		if s[i].Name == site {
+		if s[i].Name == h.Site {
 			result = s[i].Annotation // Copy out of array.
-			result.Machine = f[0]
+			result.Machine = h.Machine
 			g.v4, g.v6, err = parseCIDR(s[i].Network.IPv4, s[i].Network.IPv6)
 			if err != nil {
 				return nil, err

siteannotator/server_test.go

@@ -108,22 +108,22 @@ func TestNew(t *testing.T) {
 			name:     "success-empty-ipv4-with-ipv6-connection",
 			localIPs: []net.IP{net.ParseIP("2001:5a0:4300::2")},
 			provider: localRawfile,
-			hostname: "mlab1.four0.measurement-lab.org",
+			hostname: "mlab1.six02.measurement-lab.org",
 			ID: &inetdiag.SockID{
 				SPort: 1,
 				SrcIP: "2001:5a0:4300::2",
 				DPort: 2,
 				DstIP: "2600::1",
 			},
 			want: annotator.Annotations{
-				Server: minimalServerAnn("four0"),
+				Server: minimalServerAnn("six02"),
 			},
 		},
 		{
 			name:     "success-empty-ipv4-with-ipv4-connection",
 			localIPs: []net.IP{net.ParseIP("64.86.148.137")},
 			provider: localRawfile,
-			hostname: "mlab1.four0.measurement-lab.org",
+			hostname: "mlab1.six02.measurement-lab.org",
 			ID: &inetdiag.SockID{
 				SPort: 1,
 				SrcIP: "64.86.148.137",
@@ -230,6 +230,29 @@ func Test_srvannotator_load(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:     "success-project-flat-name",
+			provider: localRawfile,
+			hostname: "mlab1-lga03.mlab-oti.measurement-lab.org",
+			want: &annotator.ServerAnnotations{
+				Site:    "lga03",
+				Machine: "mlab1",
+				Geo: &annotator.Geolocation{
+					ContinentCode: "NA",
+					CountryCode:   "US",
+					City:          "New York",
+					Latitude:      40.7667,
+					Longitude:     -73.8667,
+				},
+				Network: &annotator.Network{
+					ASNumber: 6453,
+					ASName:   "TATA COMMUNICATIONS (AMERICA) INC",
+					Systems: []annotator.System{
+						{ASNs: []uint32{6453}},
+					},
+				},
+			},
+		},
 		{
 			name:     "success-no-six",
 			provider: localRawfile,
@@ -275,6 +298,12 @@ func Test_srvannotator_load(t *testing.T) {
 			hostname: "this-is-not-a-hostname",
 			wantErr:  true,
 		},
+		{
+			name:     "error-bad-name-separator",
+			provider: localRawfile,
+			hostname: "mlab1=lga03.mlab-oti.measurement-lab.org",
+			wantErr:  true,
+		},
 		{
 			name:     "error-hostname-not-in-annotations",
 			provider: localRawfile,

testdata/annotations.json

@@ -36,9 +36,9 @@
          "Network": {
             "ASName": "TATA COMMUNICATIONS (AMERICA) INC"
          },
-         "Site": "four0"
+         "Site": "six02"
       },
-      "Name": "four0",
+      "Name": "six02",
       "Network": {
          "IPv4": "",
          "IPv6": "2001:5a0:4300::/64"