Skip to content

Allow IPv6 addresses for ERSPAN sessions #4763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lip-sun wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −9
Open

Allow IPv6 addresses for ERSPAN sessions #4763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1559,6 +1559,16 @@ def remove_router_interface_ip_address(config_db, interface_name, ipaddress_to_r
if ipaddress.ip_interface(ipaddress_string) == ipaddress_to_remove:
config_db.set_entry(table_name, (interface_name, ipaddress_string), None)


def validate_ip_address(ctx, param, ip_addr):
"""Helper function to validate IP address
"""
try:
ipaddress.ip_network(ip_addr, False)
return ip_addr
except ValueError as e:
raise click.UsageError(str(e))

def validate_ipv4_address(ctx, param, ip_addr):
"""Helper function to validate ipv4 address
"""
Expand Down Expand Up @@ -3319,8 +3329,8 @@ def erspan(ctx):

@erspan.command('add')
@click.argument('session_name', metavar='<session_name>', required=True)
@click.argument('src_ip', metavar='<src_ip>', callback=validate_ipv4_address, required=True)
@click.argument('dst_ip', metavar='<dst_ip>', callback=validate_ipv4_address,required=True)
@click.argument('src_ip', metavar='<src_ip>', callback=validate_ip_address, required=True)
@click.argument('dst_ip', metavar='<dst_ip>', callback=validate_ip_address, required=True)
@click.argument('dscp', metavar='<dscp>', type=DSCP_RANGE, required=True)
@click.argument('ttl', metavar='<ttl>', type=TTL_RANGE, required=True)
@click.argument('gre_type', metavar='[gre_type]', callback=validate_gre_type, required=False)
Expand Down
14 changes: 7 additions & 7 deletions tests/config_mirror_session_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,6 @@ def test_mirror_session_erspan_add():
assert result.exit_code != 0
assert ERR_MSG_IP_FAILURE in result.stdout

# Verify invalid ip version
result = runner.invoke(
config.config.commands["mirror_session"].commands["erspan"].commands["add"],
["test_session", "1::1", "2::2", "8", "63", "10", "100"])
assert result.exit_code != 0
assert ERR_MSG_IP_VERSION_FAILURE in result.stdout

# Verify invalid dscp
result = runner.invoke(
config.config.commands["mirror_session"].commands["erspan"].commands["add"],
Expand Down Expand Up @@ -176,6 +169,13 @@ def test_mirror_session_erspan_add():

mocked.assert_called_with("test_session", "100.1.1.1", "2.2.2.2", 8, 63, 0, 0, None, None, None, 0, 0)

# Verify IPv6 ERSPAN session
result = runner.invoke(
config.config.commands["mirror_session"].commands["erspan"].commands["add"],
["test_session", "2001:db8::1", "2001:db8::2", "8", "63", "10", "100"])

assert result.exit_code == 0
mocked.assert_called_with("test_session", "2001:db8::1", "2001:db8::2", 8, 63, 10, 100, None, None, None, 0, 0)

@patch("validated_config_db_connector.device_info.is_yang_config_validation_enabled", mock.Mock(return_value=True))
@patch("config.validated_config_db_connector.ValidatedConfigDBConnector.validated_set_entry", mock.Mock(side_effect=ValueError))
Expand Down
Loading