Skip to content

Commit

Permalink
[neighbor_advertiser]: Adapt to different mirror ACL table names (#703)
Browse files Browse the repository at this point in the history
ACL table names varies on different platforms.
The current assumption is that the name would contain either
EVERFLOW or EVERFLOWV6.

Thus a function find_mirror_table_name is added to find the exact
names for both the v4 and v6 mirror table names.

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
  • Loading branch information
stcheng authored and lguohan committed Oct 18, 2019
1 parent 342f3a1 commit fc324f2
Showing 1 changed file with 46 additions and 19 deletions.
65 changes: 46 additions & 19 deletions scripts/neighbor_advertiser
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ SYSLOG_IDENTIFIER = 'neighbor_advertiser'
#

MIRROR_SESSION_NAME = 'neighbor_advertiser'
MIRROR_ACL_TABLE_PREFIX = 'SONIC_'
MIRROR_ACL_TABLE_NAME = 'EVERFLOW'
MIRROR_ACL_TABLEV6_NAME = 'EVERFLOWV6'
MIRROR_ACL_RULE_NAME = 'rule_arp'
Expand Down Expand Up @@ -384,10 +385,30 @@ def save_as_json(obj, file_path):
json.dump(obj, outfile, sort_keys = True)


# This function tries to find the corresponding names of the mirror v4 and v6 table
# Right now, the name could be EVERFLOW/EVERFLOWv6 or SONIC_EVERFLOW/SONIC_EVERFLOWV6
def find_mirror_table_name():
acl_tables = config_db.get_keys("ACL_TABLE")
v4_table, v6_table = "", ""
for table in acl_tables:
if MIRROR_ACL_TABLE_NAME == table or \
MIRROR_ACL_TABLE_PREFIX + MIRROR_ACL_TABLE_NAME == table:
v4_table = table
if MIRROR_ACL_TABLEV6_NAME == table or \
MIRROR_ACL_TABLE_PREFIX + MIRROR_ACL_TABLEV6_NAME == table:
v6_table = table
if not v4_table:
log_error(MIRROR_ACL_TABLE_NAME + " table does not exist")
if not v6_table:
log_error(MIRROR_ACL_TABLEV6_NAME + " table does not exist")
return (v4_table, v6_table)


#
# Set mirror tunnel
#


def add_mirror_session(dst_ipv4_addr):
session_info = {
'src_ip': get_loopback_addr(4),
Expand All @@ -397,25 +418,26 @@ def add_mirror_session(dst_ipv4_addr):
config_db.set_entry('MIRROR_SESSION', MIRROR_SESSION_NAME, session_info)



def add_mirror_acl_rule():
acl_rule_info = {
'PRIORITY': '8888',
'ether_type': '2054',
'mirror_action': MIRROR_SESSION_NAME
}

config_db.set_entry('ACL_RULE',
(MIRROR_ACL_TABLE_NAME, MIRROR_ACL_RULE_NAME), acl_rule_info)
(v4_table, v6_table) = find_mirror_table_name()

acl_rule_info = {
'PRIORITY': '8887',
'ICMPV6_TYPE': '135',
'mirror_action': MIRROR_SESSION_NAME
}

config_db.set_entry('ACL_RULE',
(MIRROR_ACL_TABLEV6_NAME, MIRROR_ACL_RULEV6_NAME), acl_rule_info)
if v4_table:
acl_rule_info = {
'PRIORITY': '8888',
'ether_type': '2054',
'mirror_action': MIRROR_SESSION_NAME
}
config_db.set_entry('ACL_RULE',
(v4_table, MIRROR_ACL_RULE_NAME), acl_rule_info)

if v6_table:
acl_rule_info = {
'PRIORITY': '8887',
'ICMPV6_TYPE': '135',
'mirror_action': MIRROR_SESSION_NAME
}
config_db.set_entry('ACL_RULE',
(v6_table, MIRROR_ACL_RULEV6_NAME), acl_rule_info)


def set_mirror_tunnel(ferret_server_ip):
Expand All @@ -433,8 +455,13 @@ def remove_mirror_session():


def remove_mirror_acl_rule():
config_db.set_entry('ACL_RULE', (MIRROR_ACL_TABLE_NAME, MIRROR_ACL_RULE_NAME), None)
config_db.set_entry('ACL_RULE', (MIRROR_ACL_TABLEV6_NAME, MIRROR_ACL_RULEV6_NAME), None)
(v4_table, v6_table) = find_mirror_table_name()

if v4_table:
config_db.set_entry('ACL_RULE', (v4_table, MIRROR_ACL_RULE_NAME), None)

if v6_table:
config_db.set_entry('ACL_RULE', (v6_table, MIRROR_ACL_RULEV6_NAME), None)


def reset_mirror_tunnel():
Expand Down

0 comments on commit fc324f2

Please sign in to comment.