@@ -103,7 +103,7 @@ def everflow_dut(self, setup_info): # noqa F811
103103 dut = setup_info [UP_STREAM ]['everflow_dut' ]
104104 else :
105105 dut = setup_info [DOWN_STREAM ]['everflow_dut' ]
106-
106+
107107 yield dut
108108
109109 @pytest .fixture (scope = 'class' )
@@ -201,7 +201,7 @@ def setup_acl_table(self, setup_info, setup_mirror_session, config_method, setup
201201 everflow_dut = setup_info [DOWN_STREAM ]['everflow_dut' ]
202202 remote_dut = setup_info [DOWN_STREAM ]['remote_dut' ]
203203
204- table_name = self ._get_table_name (everflow_dut )
204+ table_name = self ._get_table_name (everflow_dut , self . acl_stage () )
205205 temporary_table = False
206206
207207 duthost_set = set ()
@@ -214,7 +214,10 @@ def setup_acl_table(self, setup_info, setup_mirror_session, config_method, setup
214214
215215 for duthost in duthost_set :
216216 if temporary_table :
217- self .apply_acl_table_config (duthost , table_name , "MIRRORV6" , config_method )
217+ inst_list = duthost .get_sonic_host_and_frontend_asic_instance ()
218+ for inst in inst_list :
219+ self .apply_acl_table_config (duthost , table_name , "MIRRORV6" , config_method ,
220+ bind_namespace = getattr (inst , 'namespace' , None ))
218221
219222 self .apply_acl_rule_config (duthost , table_name , setup_mirror_session ["session_name" ],
220223 config_method , rules = EVERFLOW_V6_RULES )
@@ -229,16 +232,17 @@ def setup_acl_table(self, setup_info, setup_mirror_session, config_method, setup
229232 self .remove_acl_table_config (duthost , table_name , config_method )
230233
231234 # TODO: This can probably be refactored into a common utility method later.
232- def _get_table_name (self , duthost ):
235+ def _get_table_name (self , duthost , acl_stage = "ingress" ):
233236 show_output = duthost .command ("show acl table" )
234237
235238 table_name = None
236239 for line in show_output ["stdout_lines" ]:
237240 if "MIRRORV6" in line :
238- # NOTE: Once we branch out the sonic-mgmt repo we can skip the version check.
239- if "201811" in duthost .os_version or self .acl_stage () in line :
240- table_name = line .split ()[0 ]
241- break
241+ if acl_stage in line :
242+ # NOTE: Once we branch out the sonic-mgmt repo we can skip the version check.
243+ if "201811" in duthost .os_version or self .acl_stage () in line :
244+ table_name = line .split ()[0 ]
245+ break
242246
243247 return table_name
244248
0 commit comments