From fac1769624c476a81750cdb3c87a9ce4f157f939 Mon Sep 17 00:00:00 2001 From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com> Date: Thu, 12 May 2022 09:46:28 +0800 Subject: [PATCH] Accept 0 for queue and dscp (#2162) Signed-off-by: bingwang --- config/main.py | 4 ++-- tests/config_mirror_session_test.py | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/config/main.py b/config/main.py index f6ad1aa041..61ce7751b7 100644 --- a/config/main.py +++ b/config/main.py @@ -2025,7 +2025,7 @@ def gather_session_info(session_info, policer, queue, src_port, direction): if policer: session_info['policer'] = policer - if queue: + if queue is not None: session_info['queue'] = queue if src_port: @@ -2051,7 +2051,7 @@ def add_erspan(session_name, src_ip, dst_ip, dscp, ttl, gre_type, queue, policer "ttl": ttl } - if gre_type: + if gre_type is not None: session_info['gre_type'] = gre_type session_info = gather_session_info(session_info, policer, queue, src_port, direction) diff --git a/tests/config_mirror_session_test.py b/tests/config_mirror_session_test.py index 986df2e711..1b5b07e529 100644 --- a/tests/config_mirror_session_test.py +++ b/tests/config_mirror_session_test.py @@ -80,6 +80,12 @@ def test_mirror_session_add(): mocked.assert_called_with("test_session", "100.1.1.1", "2.2.2.2", 8, 63, 0x1234, 100, None) + result = runner.invoke( + config.config.commands["mirror_session"].commands["add"], + ["test_session", "100.1.1.1", "2.2.2.2", "8", "63", "0", "0"]) + + mocked.assert_called_with("test_session", "100.1.1.1", "2.2.2.2", 8, 63, 0, 0, None) + def test_mirror_session_erspan_add(): runner = CliRunner() @@ -153,6 +159,12 @@ def test_mirror_session_erspan_add(): mocked.assert_called_with("test_session", "100.1.1.1", "2.2.2.2", 8, 63, 0x1234, 100, None, None, None) + result = runner.invoke( + config.config.commands["mirror_session"].commands["erspan"].commands["add"], + ["test_session", "100.1.1.1", "2.2.2.2", "8", "63", "0", "0"]) + + mocked.assert_called_with("test_session", "100.1.1.1", "2.2.2.2", 8, 63, 0, 0, None, None, None) + def test_mirror_session_span_add(): runner = CliRunner() @@ -246,9 +258,12 @@ def test_mirror_session_span_add(): result = runner.invoke( config.config.commands["mirror_session"].commands["span"].commands["add"], ["test_session", "Ethernet8", "Ethernet4", "tx", "100"]) + + mocked.assert_called_with("test_session", "Ethernet8", "Ethernet4", "tx", 100, None) + result = runner.invoke( config.config.commands["mirror_session"].commands["span"].commands["add"], - ["test_session", "Ethernet0", "Ethernet4", "rx", "100"]) + ["test_session", "Ethernet0", "Ethernet4", "rx", "0"]) - mocked.assert_called_with("test_session", "Ethernet0", "Ethernet4", "rx", 100, None) + mocked.assert_called_with("test_session", "Ethernet0", "Ethernet4", "rx", 0, None)