From 6f9fdaa27e63a0d040585cb856678f5c384f238f Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Mon, 1 Feb 2016 06:54:08 -0800 Subject: [PATCH] Rename applications -> processes in experimental and render/detailed. --- experimental/_integration/easy_test.go | 8 ++++---- experimental/graphviz/render.go | 10 +++++----- render/detailed/node.go | 2 +- render/detailed/node_test.go | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/experimental/_integration/easy_test.go b/experimental/_integration/easy_test.go index 167fc2bee..08e2260e0 100644 --- a/experimental/_integration/easy_test.go +++ b/experimental/_integration/easy_test.go @@ -26,12 +26,12 @@ func TestComponentsAreAvailable(t *testing.T) { } } -func TestApplications(t *testing.T) { +func TestProcesses(t *testing.T) { withContext(t, oneProbe, func() { - topo := parseTopology(t, httpGet(t, fmt.Sprintf("http://localhost:%d/api/topology/applications", appPort))) + topo := parseTopology(t, httpGet(t, fmt.Sprintf("http://localhost:%d/api/topology/processes", appPort))) assertAdjacent(t, topo["proc:node-1.2.3.4:apache"], "theinternet", "proc:node-192.168.1.1:wget") want := map[string]interface{}{"max_conn_count_tcp": float64(19)} - have := parseEdge(t, httpGet(t, fmt.Sprintf("http://localhost:%d/api/topology/applications/%s/%s", appPort, "proc:node-192.168.1.1:wget", "theinternet"))) + have := parseEdge(t, httpGet(t, fmt.Sprintf("http://localhost:%d/api/topology/processes/%s/%s", appPort, "proc:node-192.168.1.1:wget", "theinternet"))) if !reflect.DeepEqual(have, want) { t.Errorf("have: %#v, want %#v", have, want) } @@ -56,7 +56,7 @@ func TestHosts(t *testing.T) { func TestMultipleProbes(t *testing.T) { withContext(t, twoProbes, func() { - topo := parseTopology(t, httpGet(t, fmt.Sprintf("http://localhost:%d/api/topology/applications", appPort))) + topo := parseTopology(t, httpGet(t, fmt.Sprintf("http://localhost:%d/api/topology/processes", appPort))) assertAdjacent(t, topo["proc:node-1.2.3.4:apache"], "theinternet", "proc:node-192.168.1.1:wget", "proc:node-192.168.1.1:curl") }) } diff --git a/experimental/graphviz/render.go b/experimental/graphviz/render.go index 6f9fd6b0a..ad36b3c72 100644 --- a/experimental/graphviz/render.go +++ b/experimental/graphviz/render.go @@ -9,11 +9,11 @@ import ( func renderTo(rpt report.Report, topology string) (render.RenderableNodes, error) { renderer, ok := map[string]render.Renderer{ - "applications": render.FilterUnconnected(render.ProcessWithContainerNameRenderer), - "applications-by-name": render.FilterUnconnected(render.ProcessNameRenderer), - "containers": render.ContainerWithImageNameRenderer, - "containers-by-image": render.ContainerImageRenderer, - "hosts": render.HostRenderer, + "processes": render.FilterUnconnected(render.ProcessWithContainerNameRenderer), + "processes-by-name": render.FilterUnconnected(render.ProcessNameRenderer), + "containers": render.ContainerWithImageNameRenderer, + "containers-by-image": render.ContainerImageRenderer, + "hosts": render.HostRenderer, }[topology] if !ok { return render.RenderableNodes{}, fmt.Errorf("unknown topology %v", topology) diff --git a/render/detailed/node.go b/render/detailed/node.go index 80dce216f..0289e3e91 100644 --- a/render/detailed/node.go +++ b/render/detailed/node.go @@ -95,7 +95,7 @@ var ( {report.Pod, NodeSummaryGroup{TopologyID: "pods", Label: "Pods", Columns: []string{}}}, {report.ContainerImage, NodeSummaryGroup{TopologyID: "containers-by-image", Label: "Container Images", Columns: []string{}}}, {report.Container, NodeSummaryGroup{TopologyID: "containers", Label: "Containers", Columns: []string{docker.CPUTotalUsage, docker.MemoryUsage}}}, - {report.Process, NodeSummaryGroup{TopologyID: "applications", Label: "Applications", Columns: []string{process.PID, process.CPUUsage, process.MemoryUsage}}}, + {report.Process, NodeSummaryGroup{TopologyID: "processes", Label: "Processes", Columns: []string{process.PID, process.CPUUsage, process.MemoryUsage}}}, } ) diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go index feded6e6f..762ea0209 100644 --- a/render/detailed/node_test.go +++ b/render/detailed/node_test.go @@ -101,8 +101,8 @@ func TestMakeDetailedHostNode(t *testing.T) { Nodes: []detailed.NodeSummary{containerNodeSummary}, }, { - Label: "Applications", - TopologyID: "applications", + Label: "Processes", + TopologyID: "processes", Columns: []string{process.PID, process.CPUUsage, process.MemoryUsage}, Nodes: []detailed.NodeSummary{process1NodeSummary, process2NodeSummary}, }, @@ -156,8 +156,8 @@ func TestMakeDetailedContainerNode(t *testing.T) { Controls: []detailed.ControlInstance{}, Children: []detailed.NodeSummaryGroup{ { - Label: "Applications", - TopologyID: "applications", + Label: "Processes", + TopologyID: "processes", Columns: []string{process.PID, process.CPUUsage, process.MemoryUsage}, Nodes: []detailed.NodeSummary{ {