Merge pull request #109 from digitalocean/save-output

ecbaldwin · web-flow · commit 2a0f99c6436b · 2021-11-05T11:43:44.000-06:00
save output of ofproto/trace
diff --git a/ovs/app.go b/ovs/app.go
@@ -52,6 +52,7 @@ func (a *AppService) ProtoTrace(bridge string, protocol Protocol, matches []Matc
 
 	pt := &ProtoTrace{
 		CommandStr: fmt.Sprintf("ovs-appctl %s", strings.Join(args, " ")),
+		RawOutput:  out,
 	}
 	err = pt.UnmarshalText(out)
 	if err != nil {
diff --git a/ovs/proto_trace.go b/ovs/proto_trace.go
@@ -139,6 +139,7 @@ type ProtoTrace struct {
 	FinalFlow       *DataPathFlows
 	DataPathActions DataPathActions
 	FlowActions     []string
+	RawOutput       []byte
 }
 
 // UnmarshalText unmarshals ProtoTrace text into a ProtoTrace type.

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ func (a *AppService) ProtoTrace(bridge string, protocol Protocol, matches []Matc`
`52`	`52`
`53`	`53`	`pt := &ProtoTrace{`
`54`	`54`	`CommandStr: fmt.Sprintf("ovs-appctl %s", strings.Join(args, " ")),`
	`55`	`+ RawOutput: out,`
`55`	`56`	`}`
`56`	`57`	`err = pt.UnmarshalText(out)`
`57`	`58`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ type ProtoTrace struct {`
`139`	`139`	`FinalFlow *DataPathFlows`
`140`	`140`	`DataPathActions DataPathActions`
`141`	`141`	`FlowActions []string`
	`142`	`+ RawOutput []byte`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`// UnmarshalText unmarshals ProtoTrace text into a ProtoTrace type.`