From 7c101b73254356d0da6ca08a14bb0084a8f91b6c Mon Sep 17 00:00:00 2001 From: Marian Pritsak Date: Tue, 19 Mar 2024 05:54:06 +0200 Subject: [PATCH] Rename all SAI attributes Signed-off-by: Marian Pritsak --- dash-pipeline/tests/libsai/vnet_out/vnet_out.cpp | 2 +- documentation/general/dash-sonic-hld.md | 2 +- .../functional/saic/config_bidir_setup_commands.py | 6 +++--- .../functional/saic/config_inbound_setup_commands.py | 4 ++-- .../functional/saic/config_outbound_setup_commands.json | 4 ++-- .../functional/saic/sai-api/test_sai_api_vnet_eni.py | 2 +- .../functional/saic/sai-api/test_sai_api_vnet_in_route.py | 2 +- .../saic/sai-api/test_sai_api_vnet_out_route.py | 2 +- ...net_outbound_small_scale_config_via_dpugen_create.json | 4 ++-- .../scale/saic/vnet_inbound_setup_commands.json | 2 +- .../scale/saic/vnet_outbound_setup_commands_scale.json | 4 ++-- .../scale/saic/vnet_outbound_setup_commands_simple.json | 2 +- .../saic/vnet_route_setup_commands_bidirectional.json | 8 ++++---- .../saic/vnet_route_setup_commands_unidirectional.json | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dash-pipeline/tests/libsai/vnet_out/vnet_out.cpp b/dash-pipeline/tests/libsai/vnet_out/vnet_out.cpp index d386c1db5..3d636cf95 100644 --- a/dash-pipeline/tests/libsai/vnet_out/vnet_out.cpp +++ b/dash-pipeline/tests/libsai/vnet_out/vnet_out.cpp @@ -114,7 +114,7 @@ int main(int argc, char **argv) attr.value.u32 = 10000; attrs.push_back(attr); - attr.id = SAI_ENI_ATTR_PPS; + attr.id = SAI_ENI_ATTR_BW; attr.value.u32 = 100000; attrs.push_back(attr); diff --git a/documentation/general/dash-sonic-hld.md b/documentation/general/dash-sonic-hld.md index 40a5f6482..988b12685 100644 --- a/documentation/general/dash-sonic-hld.md +++ b/documentation/general/dash-sonic-hld.md @@ -640,7 +640,7 @@ rx_counter = uint64 ; Number of received bytes (read-only) | DASH_QOS_TABLE | | | | | | | qos_name | | | | | | | qos_id | | | -| | | bw | SAI_ENI_ATTR_PPS | | +| | | bw | SAI_ENI_ATTR_BW | | | | | cps | SAI_ENI_ATTR_CPS | | | | | flows | SAI_ENI_ATTR_FLOWS | | | DASH_ENI_TABLE | | | *SAI_OBJECT_TYPE_ENI* | | diff --git a/test/test-cases/functional/saic/config_bidir_setup_commands.py b/test/test-cases/functional/saic/config_bidir_setup_commands.py index cd558797f..a5336caa3 100644 --- a/test/test-cases/functional/saic/config_bidir_setup_commands.py +++ b/test/test-cases/functional/saic/config_bidir_setup_commands.py @@ -92,7 +92,7 @@ "type": "SAI_OBJECT_TYPE_ENI", "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", "100000", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", "SAI_ENI_ATTR_ADMIN_STATE", "True", "SAI_ENI_ATTR_VM_UNDERLAY_DIP", ENI_VTEP_IP, @@ -134,7 +134,7 @@ "type": "SAI_OBJECT_TYPE_ENI", "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", "100000", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", "SAI_ENI_ATTR_ADMIN_STATE", "True", "SAI_ENI_ATTR_VM_UNDERLAY_DIP", NETWORK_VTEP_IP, @@ -176,7 +176,7 @@ "type": "SAI_OBJECT_TYPE_ENI", "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", "100000", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", "SAI_ENI_ATTR_ADMIN_STATE", "True", "SAI_ENI_ATTR_VM_UNDERLAY_DIP", NETWORK_VTEP_IP, diff --git a/test/test-cases/functional/saic/config_inbound_setup_commands.py b/test/test-cases/functional/saic/config_inbound_setup_commands.py index 8ba05f2bc..674b3788d 100644 --- a/test/test-cases/functional/saic/config_inbound_setup_commands.py +++ b/test/test-cases/functional/saic/config_inbound_setup_commands.py @@ -97,7 +97,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", @@ -174,7 +174,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", diff --git a/test/test-cases/functional/saic/config_outbound_setup_commands.json b/test/test-cases/functional/saic/config_outbound_setup_commands.json index 4c6b7f0c0..b4fd14735 100644 --- a/test/test-cases/functional/saic/config_outbound_setup_commands.json +++ b/test/test-cases/functional/saic/config_outbound_setup_commands.json @@ -66,7 +66,7 @@ "type": "SAI_OBJECT_TYPE_ENI", "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", "100000", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", "SAI_ENI_ATTR_ADMIN_STATE", "True", "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "221.0.1.11", @@ -108,7 +108,7 @@ "type": "SAI_OBJECT_TYPE_ENI", "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", "100000", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", "SAI_ENI_ATTR_ADMIN_STATE", "True", "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "221.0.2.101", diff --git a/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_eni.py b/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_eni.py index 30798c09e..1aa2e93bd 100644 --- a/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_eni.py +++ b/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_eni.py @@ -32,7 +32,7 @@ def test_vnet_eni_create(self, dpu): "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", diff --git a/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_in_route.py b/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_in_route.py index 73bc878fa..695fdb5ec 100644 --- a/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_in_route.py +++ b/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_in_route.py @@ -39,7 +39,7 @@ def test_vnet_inbound_routing_entry_create_setup(self, dpu): "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", diff --git a/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_out_route.py b/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_out_route.py index 2c07e1d8d..da15c78f2 100644 --- a/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_out_route.py +++ b/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_out_route.py @@ -38,7 +38,7 @@ def test_vnet_outbound_routing_entry_create(self, dpu): "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", diff --git a/test/test-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen_create.json b/test/test-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen_create.json index 93529a361..4dce1f917 100644 --- a/test/test-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen_create.json +++ b/test/test-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen_create.json @@ -81,7 +81,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", @@ -158,7 +158,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", diff --git a/test/test-cases/scale/saic/vnet_inbound_setup_commands.json b/test/test-cases/scale/saic/vnet_inbound_setup_commands.json index 98659ddba..7231676c6 100644 --- a/test/test-cases/scale/saic/vnet_inbound_setup_commands.json +++ b/test/test-cases/scale/saic/vnet_inbound_setup_commands.json @@ -59,7 +59,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", diff --git a/test/test-cases/scale/saic/vnet_outbound_setup_commands_scale.json b/test/test-cases/scale/saic/vnet_outbound_setup_commands_scale.json index 967061a6e..d1af58bc3 100644 --- a/test/test-cases/scale/saic/vnet_outbound_setup_commands_scale.json +++ b/test/test-cases/scale/saic/vnet_outbound_setup_commands_scale.json @@ -101,7 +101,7 @@ "type": "SAI_OBJECT_TYPE_ENI", "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", "100000", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", "SAI_ENI_ATTR_ADMIN_STATE", "True", "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "172.16.1.1", @@ -145,7 +145,7 @@ "type": "SAI_OBJECT_TYPE_ENI", "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", "100000", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", "SAI_ENI_ATTR_ADMIN_STATE", "True", "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "172.16.2.1", diff --git a/test/test-cases/scale/saic/vnet_outbound_setup_commands_simple.json b/test/test-cases/scale/saic/vnet_outbound_setup_commands_simple.json index d21474e5c..eaabaca00 100644 --- a/test/test-cases/scale/saic/vnet_outbound_setup_commands_simple.json +++ b/test/test-cases/scale/saic/vnet_outbound_setup_commands_simple.json @@ -53,7 +53,7 @@ "type": "SAI_OBJECT_TYPE_ENI", "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", "100000", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", "SAI_ENI_ATTR_ADMIN_STATE", "True", "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "172.16.1.1", diff --git a/test/test-cases/scale/saic/vnet_route_setup_commands_bidirectional.json b/test/test-cases/scale/saic/vnet_route_setup_commands_bidirectional.json index 4d951d3b4..b22c84c80 100644 --- a/test/test-cases/scale/saic/vnet_route_setup_commands_bidirectional.json +++ b/test/test-cases/scale/saic/vnet_route_setup_commands_bidirectional.json @@ -120,7 +120,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", @@ -197,7 +197,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", @@ -274,7 +274,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", @@ -351,7 +351,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000", diff --git a/test/test-cases/scale/saic/vnet_route_setup_commands_unidirectional.json b/test/test-cases/scale/saic/vnet_route_setup_commands_unidirectional.json index fd8a093bb..21add0082 100644 --- a/test/test-cases/scale/saic/vnet_route_setup_commands_unidirectional.json +++ b/test/test-cases/scale/saic/vnet_route_setup_commands_unidirectional.json @@ -59,7 +59,7 @@ "attributes": [ "SAI_ENI_ATTR_CPS", "10000", - "SAI_ENI_ATTR_PPS", + "SAI_ENI_ATTR_BW", "100000", "SAI_ENI_ATTR_FLOWS", "100000",