github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 09:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use image name without version as id. (#1531)

Browse Source 
* Use image name without version as id.

* Review feedback
This commit is contained in:
Tom Wilkie
2016-06-15 16:14:51 +01:00
committed by GitHub
parent d888509865
commit fba555c985
13 changed files with 127 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
render/expected/expected.go
View File

@@ -208,8 +208,11 @@ var (
render.OutgoingInternetID: theOutgoingInternetNode,
}
ClientContainerImageNodeID = report.MakeContainerImageNodeID(fixture.ClientContainerImageName)
ServerContainerImageNodeID = report.MakeContainerImageNodeID(fixture.ServerContainerImageName)
RenderedContainerImages = report.Nodes{
fixture.ClientContainerImageNodeID: containerImage(fixture.ClientContainerImageNodeID, fixture.ServerContainerImageNodeID).
ClientContainerImageNodeID: containerImage(ClientContainerImageNodeID, ServerContainerImageNodeID).
WithLatests(map[string]string{
report.HostNodeID: fixture.ClientHostNodeID,
docker.ImageID: fixture.ClientContainerImageID,
@@ -226,7 +229,7 @@ var (
RenderedContainers[fixture.ClientContainerNodeID],
)),
fixture.ServerContainerImageNodeID: containerImage(fixture.ServerContainerImageNodeID).
ServerContainerImageNodeID: containerImage(ServerContainerImageNodeID).
WithChildren(report.MakeNodeSet(
RenderedEndpoints[fixture.Server80NodeID],
RenderedProcesses[fixture.ServerProcessNodeID],
@@ -234,7 +237,7 @@ var (
)),
uncontainedServerID: uncontainedServerNode,
render.IncomingInternetID: theIncomingInternetNode(fixture.ServerContainerImageNodeID),
render.IncomingInternetID: theIncomingInternetNode(ServerContainerImageNodeID),
render.OutgoingInternetID: theOutgoingInternetNode,
}
@@ -298,7 +301,7 @@ var (
RenderedProcesses[fixture.ClientProcess1NodeID],
RenderedProcesses[fixture.ClientProcess2NodeID],
RenderedContainers[fixture.ClientContainerNodeID],
RenderedContainerImages[fixture.ClientContainerImageNodeID],
RenderedContainerImages[ClientContainerImageNodeID],
RenderedPods[fixture.ClientPodNodeID],
)),
@@ -309,7 +312,7 @@ var (
RenderedProcesses[fixture.ServerProcessNodeID],
RenderedProcesses[fixture.NonContainerProcessNodeID],
RenderedContainers[fixture.ServerContainerNodeID],
RenderedContainerImages[fixture.ServerContainerImageNodeID],
RenderedContainerImages[ServerContainerImageNodeID],
RenderedPods[fixture.ServerPodNodeID],
)),