Skip to content

Commit

Permalink
Fix generated tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Marian Pritsak <[email protected]>
  • Loading branch information
@marian-pritsak
marian-pritsak committed Sep 25, 2023
1 parent d4a5fbc commit 5e191b1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
10 changes: 6 additions & 4 deletions ...st-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
NUMBER_OF_IN_ACL_GROUP = 0
NUMBER_OF_OUT_ACL_GROUP = 0

def add_meter_attrs(attr_type, attrs, ext):
def add_extra_attrs(attr_type, attrs, ext):
i = 0
for item in attrs:
if item['type'] == attr_type:
Expand All @@ -59,12 +59,14 @@ def make_create_commands(self):
"""
conf = dpugen.sai.SaiConfig()
conf.generate()
ret = add_meter_attrs('SAI_OBJECT_TYPE_ENI', conf.items(), ["SAI_ENI_ATTR_V4_METER_POLICY_ID", "0", "SAI_ENI_ATTR_V6_METER_POLICY_ID", "0"])
ret = add_extra_attrs('SAI_OBJECT_TYPE_ENI', conf.items(), ["SAI_ENI_ATTR_V4_METER_POLICY_ID", "0", "SAI_ENI_ATTR_V6_METER_POLICY_ID", "0",
'SAI_ENI_ATTR_PL_SIP', '2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'SAI_ENI_ATTR_PL_SIP_MASK',
'2001:0db8:85a3:0000:0000:0000:0000:0000', 'SAI_ENI_ATTR_PL_UNDERLAY_SIP', '10.0.0.18'])

ret = add_meter_attrs('SAI_OBJECT_TYPE_OUTBOUND_CA_TO_PA_ENTRY', ret, [ 'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS', '0',
ret = add_extra_attrs('SAI_OBJECT_TYPE_OUTBOUND_CA_TO_PA_ENTRY', ret, [ 'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS', '0',
'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS_OVERRIDE', 'True' ])

ret = add_meter_attrs('SAI_OBJECT_TYPE_OUTBOUND_ROUTING_ENTRY', ret, [ 'SAI_OUTBOUND_ROUTING_ENTRY_ATTR_METER_POLICY_EN', 'True',
ret = add_extra_attrs('SAI_OBJECT_TYPE_OUTBOUND_ROUTING_ENTRY', ret, [ 'SAI_OUTBOUND_ROUTING_ENTRY_ATTR_METER_POLICY_EN', 'True',
'SAI_OUTBOUND_ROUTING_ENTRY_ATTR_METER_CLASS', '0' ])
return ret

Expand Down
10 changes: 6 additions & 4 deletions test/test-cases/scale/saic/test_sai_vnet_outbound_scale.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
}
}

def add_meter_attrs(attr_type, attrs, ext):
def add_extra_attrs(attr_type, attrs, ext):
i = 0
for item in attrs:
if item['type'] == attr_type:
Expand All @@ -112,12 +112,14 @@ def make_create_vnet_config(self):
conf = dpugen.sai.SaiConfig()
conf.mergeParams(TEST_VNET_OUTBOUND_CONFIG_SCALE)
conf.generate()
ret = add_meter_attrs('SAI_OBJECT_TYPE_ENI', conf.items(), ["SAI_ENI_ATTR_V4_METER_POLICY_ID", "0", "SAI_ENI_ATTR_V6_METER_POLICY_ID", "0"])
ret = add_extra_attrs('SAI_OBJECT_TYPE_ENI', conf.items(), ["SAI_ENI_ATTR_V4_METER_POLICY_ID", "0", "SAI_ENI_ATTR_V6_METER_POLICY_ID", "0",
'SAI_ENI_ATTR_PL_SIP', '2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'SAI_ENI_ATTR_PL_SIP_MASK',
'2001:0db8:85a3:0000:0000:0000:0000:0000', 'SAI_ENI_ATTR_PL_UNDERLAY_SIP', '10.0.0.18'])

ret = add_meter_attrs('SAI_OBJECT_TYPE_OUTBOUND_CA_TO_PA_ENTRY', ret, [ 'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS', '0',
ret = add_extra_attrs('SAI_OBJECT_TYPE_OUTBOUND_CA_TO_PA_ENTRY', ret, [ 'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS', '0',
'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS_OVERRIDE', 'True' ])

ret = add_meter_attrs('SAI_OBJECT_TYPE_OUTBOUND_ROUTING_ENTRY', ret, [ 'SAI_OUTBOUND_ROUTING_ENTRY_ATTR_METER_POLICY_EN', 'True',
ret = add_extra_attrs('SAI_OBJECT_TYPE_OUTBOUND_ROUTING_ENTRY', ret, [ 'SAI_OUTBOUND_ROUTING_ENTRY_ATTR_METER_POLICY_EN', 'True',
'SAI_OUTBOUND_ROUTING_ENTRY_ATTR_METER_CLASS', '0' ])
return ret

Expand Down

0 comments on commit 5e191b1

Please sign in to comment.