Skip to content
Merged
Changes from all commits
Commits
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
28 changes: 7 additions & 21 deletions e2e/cluster/cmx/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ type Network struct {
ID string `json:"id"`
}

type NetworkReport struct {
Events []NetworkEvent `json:"events"`
}

type NetworkEvent struct {
Timestamp time.Time `json:"timestamp"`
PID int `json:"pid"`
Expand Down Expand Up @@ -608,33 +612,15 @@ func (c *Cluster) waitUntilRunning(node Node, nodeNum int, timeoutDuration time.
}

func (c *Cluster) CollectNetworkReport() ([]NetworkEvent, error) {
output, err := exec.Command("replicated", "network", "report", fmt.Sprintf("--id=%v", c.network.ID), "-ojson").Output()
output, err := exec.Command("replicated", "network", "report", fmt.Sprintf("--id=%v", c.network.ID)).Output()
if err != nil {
return nil, fmt.Errorf("collect network report: %v", err)
}

type eventWrapper struct {
EventData string `json:"event_data"`
}

type networkReport struct {
Events []eventWrapper `json:"events"`
}

report := networkReport{}
report := NetworkReport{}
if err := json.Unmarshal(output, &report); err != nil {
return nil, fmt.Errorf("unmarshal network events: %v", err)
}

networkEvents := make([]NetworkEvent, 0, len(report.Events))
for _, e := range report.Events {
ne := NetworkEvent{}
if err := json.Unmarshal([]byte(e.EventData), &ne); err != nil {
return nil, fmt.Errorf("unmarshal network event data: %v", err)
}

networkEvents = append(networkEvents, ne)
}

return networkEvents, nil
return report.Events, nil
}
Loading