Merge branch 'main' into Dvaas_6

sonic-net · Dec 5, 2024 · a64cef3 · a64cef3
2 parents 9730d07 + 3bcc079
commit a64cef3
Show file tree

Hide file tree

Showing 27 changed files with 1,631 additions and 325 deletions.
diff --git a/dvaas/BUILD.bazel b/dvaas/BUILD.bazel
@@ -408,4 +408,4 @@ cmd_diff_test(
     actual_cmd = "$(execpath :test_run_validation_test_runner)",
     expected = ":test_run_validation_test.expected.output",
     tools = [":test_run_validation_test_runner"],
-)
+)
diff --git a/p4_symbolic/ir/BUILD.bazel b/p4_symbolic/ir/BUILD.bazel
@@ -89,6 +89,7 @@ cc_library(
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
+        "@com_google_protobuf//:protobuf",
     ],
 )
 

diff --git a/p4_symbolic/ir/expected/basic.txt b/p4_symbolic/ir/expected/basic.txt
@@ -709,6 +709,54 @@ parsers {
     }
   }
 }
+errors {
+  key: "HeaderTooShort"
+  value {
+    name: "HeaderTooShort"
+    value: 4
+  }
+}
+errors {
+  key: "NoError"
+  value {
+    name: "NoError"
+  }
+}
+errors {
+  key: "NoMatch"
+  value {
+    name: "NoMatch"
+    value: 2
+  }
+}
+errors {
+  key: "PacketTooShort"
+  value {
+    name: "PacketTooShort"
+    value: 1
+  }
+}
+errors {
+  key: "ParserInvalidArgument"
+  value {
+    name: "ParserInvalidArgument"
+    value: 6
+  }
+}
+errors {
+  key: "ParserTimeout"
+  value {
+    name: "ParserTimeout"
+    value: 5
+  }
+}
+errors {
+  key: "StackOutOfBounds"
+  value {
+    name: "StackOutOfBounds"
+    value: 3
+  }
+}
 
 =====MyIngress.ipv4_lpm Entries=====
 

diff --git a/p4_symbolic/ir/expected/complex_conditional.txt b/p4_symbolic/ir/expected/complex_conditional.txt
@@ -2100,4 +2100,52 @@ parsers {
     }
   }
 }
+errors {
+  key: "HeaderTooShort"
+  value {
+    name: "HeaderTooShort"
+    value: 4
+  }
+}
+errors {
+  key: "NoError"
+  value {
+    name: "NoError"
+  }
+}
+errors {
+  key: "NoMatch"
+  value {
+    name: "NoMatch"
+    value: 2
+  }
+}
+errors {
+  key: "PacketTooShort"
+  value {
+    name: "PacketTooShort"
+    value: 1
+  }
+}
+errors {
+  key: "ParserInvalidArgument"
+  value {
+    name: "ParserInvalidArgument"
+    value: 6
+  }
+}
+errors {
+  key: "ParserTimeout"
+  value {
+    name: "ParserTimeout"
+    value: 5
+  }
+}
+errors {
+  key: "StackOutOfBounds"
+  value {
+    name: "StackOutOfBounds"
+    value: 3
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/conditional.txt b/p4_symbolic/ir/expected/conditional.txt
@@ -732,4 +732,52 @@ parsers {
     }
   }
 }
+errors {
+  key: "HeaderTooShort"
+  value {
+    name: "HeaderTooShort"
+    value: 4
+  }
+}
+errors {
+  key: "NoError"
+  value {
+    name: "NoError"
+  }
+}
+errors {
+  key: "NoMatch"
+  value {
+    name: "NoMatch"
+    value: 2
+  }
+}
+errors {
+  key: "PacketTooShort"
+  value {
+    name: "PacketTooShort"
+    value: 1
+  }
+}
+errors {
+  key: "ParserInvalidArgument"
+  value {
+    name: "ParserInvalidArgument"
+    value: 6
+  }
+}
+errors {
+  key: "ParserTimeout"
+  value {
+    name: "ParserTimeout"
+    value: 5
+  }
+}
+errors {
+  key: "StackOutOfBounds"
+  value {
+    name: "StackOutOfBounds"
+    value: 3
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/conditional_sequence.txt b/p4_symbolic/ir/expected/conditional_sequence.txt
@@ -2369,4 +2369,52 @@ parsers {
     }
   }
 }
+errors {
+  key: "HeaderTooShort"
+  value {
+    name: "HeaderTooShort"
+    value: 4
+  }
+}
+errors {
+  key: "NoError"
+  value {
+    name: "NoError"
+  }
+}
+errors {
+  key: "NoMatch"
+  value {
+    name: "NoMatch"
+    value: 2
+  }
+}
+errors {
+  key: "PacketTooShort"
+  value {
+    name: "PacketTooShort"
+    value: 1
+  }
+}
+errors {
+  key: "ParserInvalidArgument"
+  value {
+    name: "ParserInvalidArgument"
+    value: 6
+  }
+}
+errors {
+  key: "ParserTimeout"
+  value {
+    name: "ParserTimeout"
+    value: 5
+  }
+}
+errors {
+  key: "StackOutOfBounds"
+  value {
+    name: "StackOutOfBounds"
+    value: 3
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/default_transition.txt b/p4_symbolic/ir/expected/default_transition.txt
@@ -201,4 +201,52 @@ parsers {
     }
   }
 }
+errors {
+  key: "HeaderTooShort"
+  value {
+    name: "HeaderTooShort"
+    value: 4
+  }
+}
+errors {
+  key: "NoError"
+  value {
+    name: "NoError"
+  }
+}
+errors {
+  key: "NoMatch"
+  value {
+    name: "NoMatch"
+    value: 2
+  }
+}
+errors {
+  key: "PacketTooShort"
+  value {
+    name: "PacketTooShort"
+    value: 1
+  }
+}
+errors {
+  key: "ParserInvalidArgument"
+  value {
+    name: "ParserInvalidArgument"
+    value: 6
+  }
+}
+errors {
+  key: "ParserTimeout"
+  value {
+    name: "ParserTimeout"
+    value: 5
+  }
+}
+errors {
+  key: "StackOutOfBounds"
+  value {
+    name: "StackOutOfBounds"
+    value: 3
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/extract_parser_operation.txt b/p4_symbolic/ir/expected/extract_parser_operation.txt
@@ -201,4 +201,52 @@ parsers {
     }
   }
 }
+errors {
+  key: "HeaderTooShort"
+  value {
+    name: "HeaderTooShort"
+    value: 4
+  }
+}
+errors {
+  key: "NoError"
+  value {
+    name: "NoError"
+  }
+}
+errors {
+  key: "NoMatch"
+  value {
+    name: "NoMatch"
+    value: 2
+  }
+}
+errors {
+  key: "PacketTooShort"
+  value {
+    name: "PacketTooShort"
+    value: 1
+  }
+}
+errors {
+  key: "ParserInvalidArgument"
+  value {
+    name: "ParserInvalidArgument"
+    value: 6
+  }
+}
+errors {
+  key: "ParserTimeout"
+  value {
+    name: "ParserTimeout"
+    value: 5
+  }
+}
+errors {
+  key: "StackOutOfBounds"
+  value {
+    name: "StackOutOfBounds"
+    value: 3
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/hardcoded.txt b/p4_symbolic/ir/expected/hardcoded.txt
@@ -301,4 +301,52 @@ parsers {
     }
   }
 }
+errors {
+  key: "HeaderTooShort"
+  value {
+    name: "HeaderTooShort"
+    value: 4
+  }
+}
+errors {
+  key: "NoError"
+  value {
+    name: "NoError"
+  }
+}
+errors {
+  key: "NoMatch"
+  value {
+    name: "NoMatch"
+    value: 2
+  }
+}
+errors {
+  key: "PacketTooShort"
+  value {
+    name: "PacketTooShort"
+    value: 1
+  }
+}
+errors {
+  key: "ParserInvalidArgument"
+  value {
+    name: "ParserInvalidArgument"
+    value: 6
+  }
+}
+errors {
+  key: "ParserTimeout"
+  value {
+    name: "ParserTimeout"
+    value: 5
+  }
+}
+errors {
+  key: "StackOutOfBounds"
+  value {
+    name: "StackOutOfBounds"
+    value: 3
+  }
+}