Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

/api/report should render the complete report #462

Merged
merged 4 commits into from
Sep 8, 2015
Merged

/api/report should render the complete report #462

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
474525b
Don't omit Node fields from JSON rendering
peterbourgon Sep 8, 2015
b143946
omitempty
peterbourgon Sep 8, 2015
b1f316f
Add Prune method (née Sterilize)
peterbourgon Sep 8, 2015
208abfa
rm Sterilize, use Prune
peterbourgon Sep 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions report/topology.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
// EdgeMetadatas and Nodes respectively. Edges are directional, and embedded
// in the Node struct.
type Topology struct {
Nodes
Nodes // TODO(pb): remove Nodes intermediate type
}

// MakeTopology gives you a Topology.
Expand Down Expand Up @@ -48,6 +48,7 @@ func (t Topology) Merge(other Topology) Topology {
}

// Nodes is a collection of nodes in a topology. Keys are node IDs.
// TODO(pb): type Topology map[string]Node
type Nodes map[string]Node

// Copy returns a value copy of the Nodes.
Expand Down Expand Up @@ -75,10 +76,10 @@ func (n Nodes) Merge(other Nodes) Nodes {
// given node in a given topology, along with the edges emanating from the
// node and metadata about those edges.
type Node struct {
Metadata `json:"-"`
Counters `json:"-"`
Metadata `json:"metadata"`
Counters `json:"counters"`
Adjacency IDList `json:"adjacency"`
Edges EdgeMetadatas `json:"-"`
Edges EdgeMetadatas `json:"edges"`

This comment was marked as abuse.

Sign in to view

}

// MakeNode creates a new Node with no initial metadata.
Expand Down