avoid breaking change

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
sonic-net · Aug 6, 2024 · 95fa234 · 95fa234
1 parent ab46204
commit 95fa234
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/proto/route.proto b/proto/route.proto
@@ -14,13 +14,15 @@ message VnetDirect {
 
 message ServiceTunnel {
     // overlay ipv6 src ip if routing_type is {servicetunnel}
-    types.IpPrefix overlay_sip_prefix = 1;
+    types.IpAddress overlay_sip = 1 [deprecated = true]; // replaced by overlay_sip_prefix
     // overlay ipv6 dst ip if routing_type is {servicetunnel}
-    types.IpPrefix overlay_dip_prefix = 2;
+    types.IpAddress overlay_dip = 2 [deprecated = true]; // replaced by overlay_dip_prefix
     // underlay ipv4 src ip if routing_type is {servicetunnel}, this is the ST GW VIP (for ST traffic) or custom VIP
     types.IpAddress underlay_sip = 3;
     // underlay ipv4 dst ip to override if routing_type is {servicetunnel}, use dst ip from packet if not specified
     types.IpAddress underlay_dip = 4;
+    types.IpAddress overlay_sip_prefix = 5;
+    types.IpAddress overlay_dip_prefix = 6;
 }
 
 message Route {
@@ -35,7 +37,9 @@ message Route {
         // service tunnel if routing_type is {service_tunnel}
         route.ServiceTunnel service_tunnel = 5;
     }
+    // Metering policy lookup enable (optional), default = false
     optional bool metering_policy_en = 6 [deprecated = true];
+    // Metering class-id, used if metering policy lookup is not enabled
     optional uint64 metering_class = 7 [deprecated = true];
     optional uint32 metering_class_or = 8;
     optional uint32 metering_class_and = 9;

diff --git a/proto/route_rule.proto b/proto/route_rule.proto
@@ -19,13 +19,16 @@ message RouteRule {
     // perform PA validation in the mapping table belonging to vnet_name. Default is set to true
     optional bool pa_validation = 5;
     // Optional
-    // Metering class aggregate bits
-    optional uint32 metering_class_or = 6;
-    optional uint32 metering_class_and = 7;
+    // Metering class-id
+    optional uint64 metering_class = 6 [deprecated = true]; // replaced by metering_class_or and metering_class_and
     // Optional
     // optional region_id which the vni/prefix belongs to as a string for any vendor optimizations
-    optional string region = 8;
-    route_type.RoutingType routing_type = 9;
+    optional string region = 7;
+    route_type.RoutingType routing_type = 8;
+    // Optional
+    // Metering class aggregate bits
+    optional uint32 metering_class_or = 9;
+    optional uint32 metering_class_and = 10;
 }
 
 // ENI Inbound route table with VNI and optional SRC PA prefix

diff --git a/proto/vnet_mapping.proto b/proto/vnet_mapping.proto
@@ -7,28 +7,37 @@ import "route_type.proto";
 
 message VnetMapping {
     // reference to routing type
-    route_type.RoutingType routing_type = 1;
+    route_type.RoutingType action_type = 1 [deprecated = true]; // renamed as routing_type
     // PA address for the CA
     types.IpAddress underlay_ip = 2;
     // Optional
     // Inner dst mac
     optional bytes mac_address = 3;
     // Optional
     // metering class-id
-    optional uint32 metering_class_or = 4;
+    optional uint64 metering_class = 4 [deprecated = true];
+    // Optional
+    // override the metering class-id coming from the route table
+    optional bool override_meter = 5 [deprecated = true];
     // Optional
     // if true, use the destination VNET VNI for encap. If false or not specified, use source VNET's VNI
-    optional bool use_dst_vni = 5;
+    optional bool use_dst_vni = 6;
     // Optional
-    optional bool use_pl_sip_eni = 6;
+    optional bool use_pl_sip_eni = 7;
     // Optional
     // overlay src ip if routing_type is {privatelink}
-    optional types.IpPrefix overlay_sip_prefix = 7;
+    optional types.IpAddress overlay_sip = 8 [deprecated = true]; // changed to overlay_sip_prefix
     // Optional
     // overlay dst ip if routing_type is {privatelink} 
-    optional types.IpPrefix overlay_dip_prefix = 8;
+    optional types.IpAddress overlay_dip = 9 [deprecated = true]; // changed to overlay_dip_prefix
     // Optional
-    optional string tunnel = 9;
+    // ID of routing appliance if routing_type is {privatelinknsg}
+    optional uint32 routing_appliance_id = 10 [deprecated = true];
+    optional uint32 metering_class_or = 12;
+    optional types.IpPrefix overlay_sip_prefix = 13;
+    optional types.IpPrefix overlay_dip_prefix = 14;
+    optional string tunnel = 15;
+    route_type.RoutingType routing_type = 16;
 }
 
 // CA-PA mapping table for Vnet