Protojson

cmd/webServer.go

@@ -0,0 +1,38 @@
+package main
+
+import (
+	"io/ioutil"
+
+	"html/template"
+	"net/http"
+
+	protov1 "github.com/golang/protobuf/proto"
+	"github.com/stratum/testvectors/proto/testvector"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+func main() {
+	tv, _ := getTVFromFile("bmv2/p4runtime/L3ForwardTest.pb.txt")
+	json := protojson.MarshalOptions{Multiline: true}
+	sb, _ := json.Marshal(tv)
+
+	tmpl := template.Must(template.ParseFiles("tools/ui/index.gohtml"))
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		tmpl.Execute(w, string(sb))
+	})
+	http.ListenAndServe(":8080", nil)
+
+}
+
+// getTVFromFile reads Test Vector file with given file name and returns Test Vector
+func getTVFromFile(fileName string) (*testvector.TestVector, error) {
+	tvdata, err := ioutil.ReadFile(fileName)
+	if err != nil {
+		return nil, err
+	}
+	tVec := &testvector.TestVector{}
+	if err = protov1.UnmarshalText(string(tvdata), tVec); err != nil {
+		return nil, err
+	}
+	return tVec, nil
+}

go.mod

@@ -0,0 +1,10 @@
+module github.com/stratum/testvectors
+
+go 1.14
+
+require (
+	github.com/golang/protobuf v1.4.0
+	github.com/openconfig/gnmi v0.0.0-20190716195134-52dcbf240490
+	github.com/p4lang/p4runtime v1.1.1-0.20200430195407-64b55baee21c
+	google.golang.org/protobuf v1.21.0
+)

go.sum

@@ -0,0 +1,75 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/openconfig/gnmi v0.0.0-20190716195134-52dcbf240490 h1:E0JGIDXS/opRdA7Vd9+dcRcKxG4wGn9s2YueZrufgGo=
+github.com/openconfig/gnmi v0.0.0-20190716195134-52dcbf240490/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc=
+github.com/p4lang/p4runtime v1.1.1-0.20200430195407-64b55baee21c h1:MgEUT47ff9uJz8Q7FxDZanb3BgRkjqSbZe/CCi6Bx8s=
+github.com/p4lang/p4runtime v1.1.1-0.20200430195407-64b55baee21c/go.mod h1:voPsRsgz/TDEhcaFvBxfMbI++hSKR/QGJusJveEs9Jg=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36 h1:j7CmVRD4Kec0+f8VuBAc2Ak2MFfXm5Q2/RxuJLL+76E=
+google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
+google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

pkg/infomap/p4info.go

@@ -0,0 +1,110 @@
+package infomap
+
+import (
+	"io/ioutil"
+	"os"
+
+	protov1 "github.com/golang/protobuf/proto"
+	p4_config_v1 "github.com/p4lang/p4runtime/go/p4/config/v1"
+)
+
+// InfoMap provides the core table/action name to id mapping methods
+type InfoMap struct {
+	p4Info *p4_config_v1.P4Info
+}
+
+// NewInfoMap instantiates the implementing data structure of InfoMap interface
+// requires the filesystem path to the text encoded p4info file
+// best place to start as a consumer of the infomap library
+func NewInfoMap(p4InfoFilePath string) (*InfoMap, error) {
+	info, err := unMarshalP4Info(p4InfoFilePath)
+	if err != nil {
+		return nil, err
+	}
+	return &InfoMap{
+		p4Info: info,
+	}, nil
+}
+
+// Table finds the requested table ID
+// returns tableName and a fieldId indexed map of the match field names
+func (i *InfoMap) Table(id uint32) (tableName string, matchFields map[uint32]string) {
+	for _, table := range i.p4Info.Tables {
+		if table.Preamble.Id == id {
+			tableName = table.Preamble.Alias
+			matchFields = make(map[uint32]string)
+			for _, match := range table.MatchFields {
+				matchFields[match.Id] = match.Name
+			}
+			return
+		}
+	}
+	return
+}
+
+// TableID ...
+func (i *InfoMap) TableID(name string) uint32 {
+	for _, table := range i.p4Info.Tables {
+		switch name {
+		case table.Preamble.Alias:
+			return table.Preamble.Id
+		case table.Preamble.Name:
+			return table.Preamble.Id
+		}
+	}
+	return 0
+}
+
+// TableName ...
+func (i *InfoMap) TableName(id uint32) string {
+	for _, table := range i.p4Info.Tables {
+		if table.Preamble.Id == id {
+			return table.Preamble.Alias
+		}
+	}
+	return ""
+}
+
+// ActionID ...
+func (i *InfoMap) ActionID(name string) uint32 {
+	for _, action := range i.p4Info.Actions {
+		switch name {
+		case action.Preamble.Alias:
+			return action.Preamble.Id
+		case action.Preamble.Name:
+			return action.Preamble.Id
+		}
+	}
+	return 0
+}
+
+// ActionName ...
+func (i *InfoMap) ActionName(id uint32) string {
+	for _, action := range i.p4Info.Actions {
+		if action.Preamble.Id == id {
+			return action.Preamble.Alias
+		}
+	}
+	return ""
+}
+
+// unMarshalP4Info reads p4info encoding/text
+func unMarshalP4Info(fileName string) (*p4_config_v1.P4Info, error) {
+	var err error
+	if _, err = os.Stat(fileName); !os.IsNotExist(err) {
+		// path/to/whatever exists
+		sb, err := ioutil.ReadFile(fileName)
+		if err != nil {
+			return nil, err
+		}
+		ret := &p4_config_v1.P4Info{}
+		if err = protov1.UnmarshalText(string(sb), ret); err != nil {
+			return nil, err
+		}
+
+		return ret, nil
+
+	}
+
+	return nil, err
+}

pkg/infomap/p4info_test.go

@@ -0,0 +1,58 @@
+package infomap
+
+import (
+	"testing"
+
+	p4_config_v1 "github.com/p4lang/p4runtime/go/p4/config/v1"
+)
+
+func mockP4info(t *testing.T) *p4_config_v1.P4Info {
+	helloworldTable := &p4_config_v1.Table{
+		Preamble: &p4_config_v1.Preamble{
+			Id:    9999,
+			Name:  "fabric.ingress.helloworld",
+			Alias: "helloworld",
+		},
+		MatchFields: []*p4_config_v1.MatchField{
+			{Id: 1, Name: "port"},
+			{Id: 2, Name: "mac"},
+			{Id: 3, Name: "ip"},
+		},
+	}
+	return &p4_config_v1.P4Info{
+		Tables: []*p4_config_v1.Table{helloworldTable},
+	}
+
+}
+func TestInfoMap_TableID(t *testing.T) {
+	mockinfo := mockP4info(t)
+	type fields struct {
+		p4Info *p4_config_v1.P4Info
+	}
+	type args struct {
+		name string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   uint32
+	}{
+		{
+			name:   "helloworld",
+			fields: fields{mockinfo},
+			args:   args{"helloworld"},
+			want:   9999,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			i := &InfoMap{
+				p4Info: tt.fields.p4Info,
+			}
+			if got := i.TableID(tt.args.name); got != tt.want {
+				t.Errorf("InfoMap.TableID() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

tools/ui/index.gohtml

@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+
+    <!-- Include from a free CDN -->
+    <script src="https://cdn.rawgit.com/caldwell/renderjson/master/renderjson.js"></script>
+    <style>
+        #container {
+            text-shadow: none;
+            background: #303030;
+            padding: 1em;
+        }
+
+        .renderjson a {
+            text-decoration: none;
+            color: dodgerblue;
+        }
+
+        .renderjson .disclosure {
+            color: gainsboro;
+            font-size: 150%;
+        }
+
+        .renderjson .syntax {
+            color: grey;
+        }
+
+        .renderjson .string {
+            color: red;
+        }
+
+        .renderjson .number {
+            color: cyan;
+        }
+
+        .renderjson .boolean {
+            color: plum;
+        }
+
+        .renderjson .key {
+            color: lightblue;
+        }
+
+        .renderjson .keyword {
+            color: lightgoldenrodyellow;
+        }
+
+        .renderjson .object.syntax {
+            color: lightseagreen;
+        }
+
+        .renderjson .array.syntax {
+            color: lightsalmon;
+        }
+    </style>
+</head>
+
+<body>
+    <p>hello world </p>
+    <!-- Element where the list will be created -->
+    <div id="container"></div>
+
+    <script>
+        var data = JSON.parse({{ . }});
+        // Render toggable list in the container element
+        document.getElementById("container").appendChild(
+            renderjson(data)
+        );
+    </script>
+</body>
+
+</html>