Skip to content

Commit ecc6fd4

Browse files
authored
Unconditioanlly adds "mlab" as value of Org field for v2 parsing (#189)
* Unconditioanlly adds "mlab" as value of Org field for v2 parsing All v2 names are Org "mlab", so no reason to leave it blank * Fixes unit tests for host package * Adds comment about why Org="mlab" for v2 names
1 parent 3f4dad6 commit ecc6fd4

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

host/host.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,11 @@ func parseHostV2(f []string) (Name, error) {
138138
if domain != "measurement-lab.org" {
139139
return Name{}, fmt.Errorf("invalid domain: %#v", f)
140140
}
141+
// All V2 names represent machines that are managed by M-Lab, and join the
142+
// M-Lab platform cluster. Unconditionally set Org to "mlab" rather than
143+
// leaving it blank.
141144
parts := Name{
145+
Org: "mlab",
142146
Service: service,
143147
Machine: machine,
144148
Site: site,

host/host_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ func TestName(t *testing.T) {
2929
name: "valid-v2",
3030
hostname: "mlab1-lol01.mlab-sandbox.measurement-lab.org",
3131
want: Name{
32+
Org: "mlab",
3233
Machine: "mlab1",
3334
Site: "lol01",
3435
Project: "mlab-sandbox",
@@ -40,6 +41,7 @@ func TestName(t *testing.T) {
4041
name: "valid-v2-with-suffix",
4142
hostname: "mlab1-lol01.mlab-sandbox.measurement-lab.org-a9b8",
4243
want: Name{
44+
Org: "mlab",
4345
Machine: "mlab1",
4446
Site: "lol01",
4547
Project: "mlab-sandbox",
@@ -52,6 +54,7 @@ func TestName(t *testing.T) {
5254
name: "valid-v2-with-service",
5355
hostname: "ndt-mlab1-lol01.mlab-sandbox.measurement-lab.org",
5456
want: Name{
57+
Org: "mlab",
5558
Service: "ndt",
5659
Machine: "mlab1",
5760
Site: "lol01",
@@ -64,6 +67,7 @@ func TestName(t *testing.T) {
6467
name: "valid-v2-with-service-and-suffix",
6568
hostname: "ndt-mlab1-lol01.mlab-sandbox.measurement-lab.org-a9b8",
6669
want: Name{
70+
Org: "mlab",
6771
Service: "ndt",
6872
Machine: "mlab1",
6973
Site: "lol01",
@@ -92,6 +96,7 @@ func TestName(t *testing.T) {
9296
name: "valid-v2-bmc",
9397
hostname: "mlab1d-lol01.mlab-sandbox.measurement-lab.org",
9498
want: Name{
99+
Org: "mlab",
95100
Machine: "mlab1d",
96101
Site: "lol01",
97102
Project: "mlab-sandbox",

0 commit comments

Comments
 (0)