Fix issues.

sonic-net · Jul 16, 2024 · 049d0b1 · 049d0b1
1 parent 0b0d812
commit 049d0b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/dash-pipeline/bmv2/routing_actions/routing_action_reverse_tunnel.p4 b/dash-pipeline/bmv2/routing_actions/routing_action_reverse_tunnel.p4
@@ -46,7 +46,7 @@ control do_action_reverse_tunnel(
         meta.dash_reverse_tunnel_next_hop_id = dash_reverse_tunnel_next_hop_id;
     }
 
-    @SaiTable[name = "dash_reverse_tunnel", api = "dash_reverse_tunnel", order = 1, isobject="true"]
+    @SaiTable[name = "dash_reverse_tunnel_member", api = "dash_reverse_tunnel", order = 1, isobject="true"]
     table reverse_tunnel_member {
         key = {
             meta.dash_reverse_tunnel_id : exact @SaiVal[type="sai_object_id_t"];
@@ -69,7 +69,7 @@ control do_action_reverse_tunnel(
         meta.reverse_tunnel_data.underlay_sip = sip;
     }
 
-    @SaiTable[name = "dash_reverse_tunnel", api = "dash_reverse_tunnel", order = 2, isobject="true"]
+    @SaiTable[name = "dash_reverse_tunnel_next_hop", api = "dash_reverse_tunnel", order = 2, isobject="true"]
     table reverse_tunnel_next_hop {
         key = {
             meta.dash_reverse_tunnel_next_hop_id : exact @SaiVal[type="sai_object_id_t"];

diff --git a/dash-pipeline/bmv2/stages/outbound_reverse_routing.p4 b/dash-pipeline/bmv2/stages/outbound_reverse_routing.p4
@@ -12,7 +12,7 @@ control outbound_reverse_routing_stage(
         meta.outbound_reverse_routing_data.disabled = (bool)disabled;
     }
 
-    @SaiTable[name = "outbound_reverse_routing_group", api = "dash_outbound_reverse_routing", order = 1, isobject="true"]
+    @SaiTable[name = "outbound_reverse_routing_group", api = "dash_outbound_reverse_routing", order = 0, isobject="true"]
     table outbound_reverse_routing_group {
         key = {
             meta.outbound_reverse_routing_data.routing_group_id: exact @SaiVal[type="sai_object_id_t"];
@@ -35,7 +35,7 @@ control outbound_reverse_routing_stage(
 
     DEFINE_TABLE_COUNTER(reverse_routing_counter)
 
-    @SaiTable[name = "outbound_reverse_routing", api = "dash_outbound_reverse_routing"]
+    @SaiTable[name = "outbound_reverse_routing", api = "dash_outbound_reverse_routing", order = 1]
     table reverse_routing {
         key = {
             meta.outbound_reverse_routing_data.routing_group_id : exact @SaiVal[type="sai_object_id_t"];

diff --git a/dash-pipeline/bmv2/stages/routing_action_apply.p4 b/dash-pipeline/bmv2/stages/routing_action_apply.p4
@@ -16,6 +16,8 @@ control routing_action_apply(
         // because it requires the transforms on the inner packet to be finished in order to
         // get the correct inner packet size and other informations.
         do_action_static_encap.apply(hdr, meta);
+
+        do_action_reverse_tunnel.apply(hdr, meta);
     }
 }