Extend BMv2 proto with error codes. (sonic-net#764)

Co-authored-by: kishanps <[email protected]>
VSuryaprasad-HCL · Nov 26, 2024 · 421ecac · 421ecac
1 parent 1027213
commit 421ecac
Show file tree

Hide file tree

Showing 9 changed files with 396 additions and 1 deletion.
diff --git a/p4_symbolic/bmv2/bmv2.proto b/p4_symbolic/bmv2/bmv2.proto
@@ -78,14 +78,16 @@ message P4Program {
   repeated Deparser deparsers = 4;
   // All actions defined in the program, including their names
   // paramters, and bodies.
-  // Eventhough actions are typically attached to tables,
+  // Even though actions are typically attached to tables,
   // they are defined seperatly in the JSON format,
   // and the table definitions refer to them by their action id.
   repeated Action actions = 5;
   // All pipelines (e.g. control constructs) defined in the program,
   // including all their tables, and the mapping of tables
   // to actions via match keys.
   repeated Pipeline pipelines = 6;
+  // All errors defined in the program.
+  repeated google.protobuf.ListValue errors = 7;
 }
 
 // A P4 header type definition.

diff --git a/p4_symbolic/bmv2/expected/basic.pb.txt b/p4_symbolic/bmv2/expected/basic.pb.txt
@@ -1109,3 +1109,59 @@ pipelines {
     source_fragment: "MyEgress"
   }
 }
+errors {
+  values {
+    string_value: "NoError"
+  }
+  values {
+    number_value: 0
+  }
+}
+errors {
+  values {
+    string_value: "PacketTooShort"
+  }
+  values {
+    number_value: 1
+  }
+}
+errors {
+  values {
+    string_value: "NoMatch"
+  }
+  values {
+    number_value: 2
+  }
+}
+errors {
+  values {
+    string_value: "StackOutOfBounds"
+  }
+  values {
+    number_value: 3
+  }
+}
+errors {
+  values {
+    string_value: "HeaderTooShort"
+  }
+  values {
+    number_value: 4
+  }
+}
+errors {
+  values {
+    string_value: "ParserTimeout"
+  }
+  values {
+    number_value: 5
+  }
+}
+errors {
+  values {
+    string_value: "ParserInvalidArgument"
+  }
+  values {
+    number_value: 6
+  }
+}
diff --git a/p4_symbolic/bmv2/expected/hardcoded.pb.txt b/p4_symbolic/bmv2/expected/hardcoded.pb.txt
@@ -522,3 +522,59 @@ pipelines {
     source_fragment: "UselessEgress"
   }
 }
+errors {
+  values {
+    string_value: "NoError"
+  }
+  values {
+    number_value: 0
+  }
+}
+errors {
+  values {
+    string_value: "PacketTooShort"
+  }
+  values {
+    number_value: 1
+  }
+}
+errors {
+  values {
+    string_value: "NoMatch"
+  }
+  values {
+    number_value: 2
+  }
+}
+errors {
+  values {
+    string_value: "StackOutOfBounds"
+  }
+  values {
+    number_value: 3
+  }
+}
+errors {
+  values {
+    string_value: "HeaderTooShort"
+  }
+  values {
+    number_value: 4
+  }
+}
+errors {
+  values {
+    string_value: "ParserTimeout"
+  }
+  values {
+    number_value: 5
+  }
+}
+errors {
+  values {
+    string_value: "ParserInvalidArgument"
+  }
+  values {
+    number_value: 6
+  }
+}
diff --git a/p4_symbolic/bmv2/expected/reflector.pb.txt b/p4_symbolic/bmv2/expected/reflector.pb.txt
@@ -350,3 +350,59 @@ pipelines {
     source_fragment: "UselessEgress"
   }
 }
+errors {
+  values {
+    string_value: "NoError"
+  }
+  values {
+    number_value: 0
+  }
+}
+errors {
+  values {
+    string_value: "PacketTooShort"
+  }
+  values {
+    number_value: 1
+  }
+}
+errors {
+  values {
+    string_value: "NoMatch"
+  }
+  values {
+    number_value: 2
+  }
+}
+errors {
+  values {
+    string_value: "StackOutOfBounds"
+  }
+  values {
+    number_value: 3
+  }
+}
+errors {
+  values {
+    string_value: "HeaderTooShort"
+  }
+  values {
+    number_value: 4
+  }
+}
+errors {
+  values {
+    string_value: "ParserTimeout"
+  }
+  values {
+    number_value: 5
+  }
+}
+errors {
+  values {
+    string_value: "ParserInvalidArgument"
+  }
+  values {
+    number_value: 6
+  }
+}
diff --git a/p4_symbolic/bmv2/expected/set_invalid.pb.txt b/p4_symbolic/bmv2/expected/set_invalid.pb.txt
@@ -644,3 +644,59 @@ pipelines {
     source_fragment: "UselessEgress"
   }
 }
+errors {
+  values {
+    string_value: "NoError"
+  }
+  values {
+    number_value: 0
+  }
+}
+errors {
+  values {
+    string_value: "PacketTooShort"
+  }
+  values {
+    number_value: 1
+  }
+}
+errors {
+  values {
+    string_value: "NoMatch"
+  }
+  values {
+    number_value: 2
+  }
+}
+errors {
+  values {
+    string_value: "StackOutOfBounds"
+  }
+  values {
+    number_value: 3
+  }
+}
+errors {
+  values {
+    string_value: "HeaderTooShort"
+  }
+  values {
+    number_value: 4
+  }
+}
+errors {
+  values {
+    string_value: "ParserTimeout"
+  }
+  values {
+    number_value: 5
+  }
+}
+errors {
+  values {
+    string_value: "ParserInvalidArgument"
+  }
+  values {
+    number_value: 6
+  }
+}
diff --git a/p4_symbolic/bmv2/expected/table.pb.txt b/p4_symbolic/bmv2/expected/table.pb.txt
@@ -362,3 +362,59 @@ pipelines {
     source_fragment: "UselessEgress"
   }
 }
+errors {
+  values {
+    string_value: "NoError"
+  }
+  values {
+    number_value: 0
+  }
+}
+errors {
+  values {
+    string_value: "PacketTooShort"
+  }
+  values {
+    number_value: 1
+  }
+}
+errors {
+  values {
+    string_value: "NoMatch"
+  }
+  values {
+    number_value: 2
+  }
+}
+errors {
+  values {
+    string_value: "StackOutOfBounds"
+  }
+  values {
+    number_value: 3
+  }
+}
+errors {
+  values {
+    string_value: "HeaderTooShort"
+  }
+  values {
+    number_value: 4
+  }
+}
+errors {
+  values {
+    string_value: "ParserTimeout"
+  }
+  values {
+    number_value: 5
+  }
+}
+errors {
+  values {
+    string_value: "ParserInvalidArgument"
+  }
+  values {
+    number_value: 6
+  }
+}
diff --git a/p4_symbolic/bmv2/expected/table_hit_1.pb.txt b/p4_symbolic/bmv2/expected/table_hit_1.pb.txt
@@ -860,3 +860,59 @@ pipelines {
     source_fragment: "MyEgress"
   }
 }
+errors {
+  values {
+    string_value: "NoError"
+  }
+  values {
+    number_value: 0
+  }
+}
+errors {
+  values {
+    string_value: "PacketTooShort"
+  }
+  values {
+    number_value: 1
+  }
+}
+errors {
+  values {
+    string_value: "NoMatch"
+  }
+  values {
+    number_value: 2
+  }
+}
+errors {
+  values {
+    string_value: "StackOutOfBounds"
+  }
+  values {
+    number_value: 3
+  }
+}
+errors {
+  values {
+    string_value: "HeaderTooShort"
+  }
+  values {
+    number_value: 4
+  }
+}
+errors {
+  values {
+    string_value: "ParserTimeout"
+  }
+  values {
+    number_value: 5
+  }
+}
+errors {
+  values {
+    string_value: "ParserInvalidArgument"
+  }
+  values {
+    number_value: 6
+  }
+}