Skip to content

Commit 9e9341d

Browse files
marian-pritsakmarian-pritsak
committed
Rename all SAI attributes
Signed-off-by: Marian Pritsak <marianp@mellanox.com>
1 parent 7753b2a commit 9e9341d

27 files changed

+71
-71
lines changed

‎dash-pipeline/tests/libsai/vnet_out/vnet_out.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
114114
attr.value.u32 = 10000;
115115
attrs.push_back(attr);
116116

117-
attr.id = SAI_ENI_ATTR_PPS;
117+
attr.id = SAI_ENI_ATTR_BW;
118118
attr.value.u32 = 100000;
119119
attrs.push_back(attr);
120120

‎documentation/general/dash-sonic-hld.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ rx_counter = uint64 ; Number of received bytes (read-only)
640640
| DASH_QOS_TABLE | | | | |
641641
| | qos_name | | | |
642642
| | | qos_id | | |
643-
| | | bw | SAI_ENI_ATTR_PPS | |
643+
| | | bw | SAI_ENI_ATTR_BW | |
644644
| | | cps | SAI_ENI_ATTR_CPS | |
645645
| | | flows | SAI_ENI_ATTR_FLOWS | |
646646
| DASH_ENI_TABLE | | | *SAI_OBJECT_TYPE_ENI* | |

‎test/test-cases/functional/ptf/sai_dash_utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def eni_create(self, **kwargs):
137137

138138
default_kwargs = {
139139
"cps": 10000,
140-
"pps": 100000,
140+
"bw": 100000,
141141
"flows": 100000,
142142
"admin_state": True,
143143
"vm_underlay_dip": sai_ipaddress("0.0.0.0"),

‎test/test-cases/functional/ptf/saidashacl.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def setUpSwitch(self):
192192
pl_underlay_sip = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
193193
addr=sai_thrift_ip_addr_t(ip4="10.0.0.18"))
194194
self.eni = self.create_obj(sai_thrift_create_eni, sai_thrift_remove_eni, cps=10000,
195-
pps=100000, flows=100000,
195+
bw=100000, flows=100000,
196196
admin_state=True,
197197
vm_underlay_dip=vm_underlay_dip,
198198
vm_vni=9,

‎test/test-cases/functional/ptf/saidasheni.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def setUp(self):
3434
super(CreateDeleteEniTest, self).setUp()
3535

3636
self.cps = 10000 # ENI connections per second
37-
self.pps = 100000 # ENI packets per seconds
37+
self.bw = 1000 # ENI BW
3838
self.flows = 100000 # ENI flows
3939
self.admin_state = True # ENI admin state
4040
self.vm_vni = 10 # ENI VM VNI
@@ -124,7 +124,7 @@ def createEniTest(self):
124124
"""
125125

126126
self.eni = self.eni_create(cps=self.cps,
127-
pps=self.pps,
127+
bw=self.bw,
128128
flows=self.flows,
129129
admin_state=self.admin_state,
130130
vm_underlay_dip=self.vm_underlay_dip,
@@ -315,7 +315,7 @@ def eniGetAttributesTest(self):
315315
attr = sai_thrift_get_eni_attribute(self.client,
316316
self.eni,
317317
cps=True,
318-
pps=True,
318+
bw=True,
319319
flows=True,
320320
admin_state=True,
321321
vm_underlay_dip=True,
@@ -344,7 +344,7 @@ def eniGetAttributesTest(self):
344344
self.assertEqual(self.status(), SAI_STATUS_SUCCESS)
345345

346346
self.assertEqual(attr['cps'], self.cps)
347-
self.assertEqual(attr['pps'], self.pps)
347+
self.assertEqual(attr['bw'], self.bw)
348348
self.assertEqual(attr['flows'], self.flows)
349349
self.assertEqual(attr['admin_state'], self.admin_state)
350350
self.assertEqual(attr['vm_underlay_dip'].addr.ip4, self.vm_underlay_dip.addr.ip4)
@@ -379,7 +379,7 @@ def eniSetAndGetAttributesTest(self):
379379
"""
380380

381381
test_cps = self.cps * 2
382-
test_pps = self.pps * 2
382+
test_bw = self.bw * 2
383383
test_flows = self.flows * 2
384384
test_admin_state = False
385385
test_vm_vni = 5
@@ -399,12 +399,12 @@ def eniSetAndGetAttributesTest(self):
399399
attr = sai_thrift_get_eni_attribute(self.client, self.eni, cps=True)
400400
self.assertEqual(attr['cps'], test_cps)
401401

402-
# set and verify new pps value
403-
sai_thrift_set_eni_attribute(self.client, self.eni, pps=test_pps)
402+
# set and verify new bw value
403+
sai_thrift_set_eni_attribute(self.client, self.eni, bw=test_bw)
404404
self.assertEqual(self.status(), SAI_STATUS_SUCCESS)
405405

406-
attr = sai_thrift_get_eni_attribute(self.client, self.eni, pps=True)
407-
self.assertEqual(attr['pps'], test_pps)
406+
attr = sai_thrift_get_eni_attribute(self.client, self.eni, bw=True)
407+
self.assertEqual(attr['bw'], test_bw)
408408

409409
# set and verify new flow value
410410
sai_thrift_set_eni_attribute(self.client, self.eni, flows=test_flows)
@@ -594,7 +594,7 @@ def eniSetAndGetAttributesTest(self):
594594
finally:
595595
# set ENI attributes to the original values
596596
sai_thrift_set_eni_attribute(self.client, self.eni, cps=self.cps)
597-
sai_thrift_set_eni_attribute(self.client, self.eni, pps=self.pps)
597+
sai_thrift_set_eni_attribute(self.client, self.eni, bw=self.bw)
598598
sai_thrift_set_eni_attribute(self.client, self.eni, flows=self.flows)
599599
sai_thrift_set_eni_attribute(self.client, self.eni, admin_state=self.admin_state)
600600
sai_thrift_set_eni_attribute(self.client, self.eni, vm_underlay_dip=self.vm_underlay_dip)
@@ -634,7 +634,7 @@ def eniSetAndGetAttributesTest(self):
634634
attr = sai_thrift_get_eni_attribute(self.client,
635635
self.eni,
636636
cps=True,
637-
pps=True,
637+
bw=True,
638638
flows=True,
639639
admin_state=True,
640640
vm_underlay_dip=True,
@@ -663,7 +663,7 @@ def eniSetAndGetAttributesTest(self):
663663
self.assertEqual(self.status(), SAI_STATUS_SUCCESS)
664664

665665
self.assertEqual(attr['cps'], self.cps)
666-
self.assertEqual(attr['pps'], self.pps)
666+
self.assertEqual(attr['bw'], self.bw)
667667
self.assertEqual(attr['flows'], self.flows)
668668
self.assertEqual(attr['admin_state'], self.admin_state)
669669
self.assertEqual(attr['vm_underlay_dip'].addr.ip4, self.vm_underlay_dip.addr.ip4)
@@ -706,12 +706,12 @@ def eniEtherAddressMapAttributesTest(self):
706706
try:
707707
# create test eni to verify set method
708708
test_cps = 500
709-
test_pps = 500
709+
test_bw = 500
710710
test_flows = 500
711711
test_vm_underlay_ip = sai_ipaddress('172.0.15.15')
712712

713713
test_eni = self.eni_create(cps=test_cps,
714-
pps=test_pps,
714+
bw=test_bw,
715715
flows=test_flows,
716716
admin_state=True,
717717
vm_underlay_dip=test_vm_underlay_ip,

‎test/test-cases/functional/ptf/saidashvnet_sanity.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def configureVnet(self):
6363
pl_underlay_sip = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
6464
addr=sai_thrift_ip_addr_t(ip4="10.0.0.18"))
6565
self.eni = sai_thrift_create_eni(self.client, cps=10000,
66-
pps=100000, flows=100000,
66+
bw=100000, flows=100000,
6767
admin_state=True,
6868
vm_underlay_dip=vm_underlay_dip,
6969
vm_vni=9,

‎test/test-cases/functional/saic/config_bidir_setup_commands.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
###############################################################
44

55
TOTALPACKETS = 1000
6-
PPS = 100
6+
BW = 100
77
PACKET_LENGTH = 128
88
ENI_IP = "1.1.0.1"
99
NETWORK_IP1 = "1.128.0.1"
@@ -92,7 +92,7 @@
9292
"type": "SAI_OBJECT_TYPE_ENI",
9393
"attributes": [
9494
"SAI_ENI_ATTR_CPS", "10000",
95-
"SAI_ENI_ATTR_PPS", "100000",
95+
"SAI_ENI_ATTR_BW", "100000",
9696
"SAI_ENI_ATTR_FLOWS", "100000",
9797
"SAI_ENI_ATTR_ADMIN_STATE", "True",
9898
"SAI_ENI_ATTR_VM_UNDERLAY_DIP", ENI_VTEP_IP,
@@ -134,7 +134,7 @@
134134
"type": "SAI_OBJECT_TYPE_ENI",
135135
"attributes": [
136136
"SAI_ENI_ATTR_CPS", "10000",
137-
"SAI_ENI_ATTR_PPS", "100000",
137+
"SAI_ENI_ATTR_BW", "100000",
138138
"SAI_ENI_ATTR_FLOWS", "100000",
139139
"SAI_ENI_ATTR_ADMIN_STATE", "True",
140140
"SAI_ENI_ATTR_VM_UNDERLAY_DIP", NETWORK_VTEP_IP,
@@ -176,7 +176,7 @@
176176
"type": "SAI_OBJECT_TYPE_ENI",
177177
"attributes": [
178178
"SAI_ENI_ATTR_CPS", "10000",
179-
"SAI_ENI_ATTR_PPS", "100000",
179+
"SAI_ENI_ATTR_BW", "100000",
180180
"SAI_ENI_ATTR_FLOWS", "100000",
181181
"SAI_ENI_ATTR_ADMIN_STATE", "True",
182182
"SAI_ENI_ATTR_VM_UNDERLAY_DIP", NETWORK_VTEP_IP,

‎test/test-cases/functional/saic/config_inbound_setup_commands.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
###############################################################
44

55
TOTALPACKETS = 1000
6-
PPS = 100
6+
BW = 100
77
PACKET_LENGTH = 128
88
ENI_IP = "1.1.0.1"
99
NETWORK_IP1 = "1.128.0.1"
@@ -97,7 +97,7 @@
9797
"attributes": [
9898
"SAI_ENI_ATTR_CPS",
9999
"10000",
100-
"SAI_ENI_ATTR_PPS",
100+
"SAI_ENI_ATTR_BW",
101101
"100000",
102102
"SAI_ENI_ATTR_FLOWS",
103103
"100000",
@@ -174,7 +174,7 @@
174174
"attributes": [
175175
"SAI_ENI_ATTR_CPS",
176176
"10000",
177-
"SAI_ENI_ATTR_PPS",
177+
"SAI_ENI_ATTR_BW",
178178
"100000",
179179
"SAI_ENI_ATTR_FLOWS",
180180
"100000",

‎test/test-cases/functional/saic/config_outbound_setup_commands.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"type": "SAI_OBJECT_TYPE_ENI",
6767
"attributes": [
6868
"SAI_ENI_ATTR_CPS", "10000",
69-
"SAI_ENI_ATTR_PPS", "100000",
69+
"SAI_ENI_ATTR_BW", "100000",
7070
"SAI_ENI_ATTR_FLOWS", "100000",
7171
"SAI_ENI_ATTR_ADMIN_STATE", "True",
7272
"SAI_ENI_ATTR_VM_UNDERLAY_DIP", "221.0.1.11",
@@ -108,7 +108,7 @@
108108
"type": "SAI_OBJECT_TYPE_ENI",
109109
"attributes": [
110110
"SAI_ENI_ATTR_CPS", "10000",
111-
"SAI_ENI_ATTR_PPS", "100000",
111+
"SAI_ENI_ATTR_BW", "100000",
112112
"SAI_ENI_ATTR_FLOWS", "100000",
113113
"SAI_ENI_ATTR_ADMIN_STATE", "True",
114114
"SAI_ENI_ATTR_VM_UNDERLAY_DIP", "221.0.2.101",

‎test/test-cases/functional/saic/sai-api/test_sai_api_vnet_eni.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_vnet_eni_create(self, dpu):
3232
"attributes": [
3333
"SAI_ENI_ATTR_CPS",
3434
"10000",
35-
"SAI_ENI_ATTR_PPS",
35+
"SAI_ENI_ATTR_BW",
3636
"100000",
3737
"SAI_ENI_ATTR_FLOWS",
3838
"100000",

0 commit comments

Comments
 (0)