From ee9ac591fd0d623507cf9af15526cae92f02466b Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 17 Jun 2015 14:46:10 +0000 Subject: [PATCH] DockerTagger should tag the Process topology now. --- probe/tag/docker_tagger.go | 4 ++-- probe/tag/docker_tagger_test.go | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/probe/tag/docker_tagger.go b/probe/tag/docker_tagger.go index 7fd3059bc..99fa0b7ad 100644 --- a/probe/tag/docker_tagger.go +++ b/probe/tag/docker_tagger.go @@ -271,7 +271,7 @@ func (t *DockerTagger) Containers() []*docker.Container { // Tag implements Tagger. func (t *DockerTagger) Tag(r report.Report) report.Report { - for nodeID, nodeMetadata := range r.Endpoint.NodeMetadatas { + for nodeID, nodeMetadata := range r.Process.NodeMetadatas { pidStr, ok := nodeMetadata["pid"] if !ok { //log.Printf("dockerTagger: %q: no process node ID", id) @@ -318,7 +318,7 @@ func (t *DockerTagger) Tag(r report.Report) report.Report { md[ImageName] = image.RepoTags[0] } - r.Endpoint.NodeMetadatas[nodeID].Merge(md) + r.Process.NodeMetadatas[nodeID].Merge(md) } return r diff --git a/probe/tag/docker_tagger_test.go b/probe/tag/docker_tagger_test.go index dde9ff136..ce25784f3 100644 --- a/probe/tag/docker_tagger_test.go +++ b/probe/tag/docker_tagger_test.go @@ -67,8 +67,8 @@ func TestDockerTagger(t *testing.T) { } var ( - endpoint1NodeID = "somehost.com;192.168.1.1;12345" - endpoint2NodeID = "somehost.com;192.168.1.1;67890" + pid1NodeID = report.MakeProcessNodeID("somehost.com", "1") + pid2NodeID = report.MakeProcessNodeID("somehost.com", "2") endpointNodeMetadata = report.NodeMetadata{ ContainerID: "foo", ImageID: "baz", @@ -83,17 +83,17 @@ func TestDockerTagger(t *testing.T) { ) r := report.MakeReport() - r.Endpoint.NodeMetadatas[endpoint1NodeID] = report.NodeMetadata{"pid": "1"} - r.Endpoint.NodeMetadatas[endpoint2NodeID] = report.NodeMetadata{"pid": "2"} + r.Process.NodeMetadatas[pid1NodeID] = report.NodeMetadata{"pid": "1"} + r.Process.NodeMetadatas[pid2NodeID] = report.NodeMetadata{"pid": "2"} dockerTagger, _ := NewDockerTagger("/irrelevant", 10*time.Second) runtime.Gosched() - for _, endpointNodeID := range []string{endpoint1NodeID, endpoint2NodeID} { + for _, nodeID := range []string{pid1NodeID, pid2NodeID} { want := endpointNodeMetadata.Copy() - have := dockerTagger.Tag(r).Endpoint.NodeMetadatas[endpointNodeID].Copy() + have := dockerTagger.Tag(r).Process.NodeMetadatas[nodeID].Copy() delete(have, "pid") if !reflect.DeepEqual(want, have) { - t.Errorf("%q: want %+v, have %+v", endpointNodeID, want, have) + t.Errorf("%q: want %+v, have %+v", nodeID, want, have) } }