From 33e85d37f6abd4e7707d4c2436c9014239ce8d06 Mon Sep 17 00:00:00 2001 From: Yaqiang Zhu Date: Thu, 16 Feb 2023 02:31:01 +0800 Subject: [PATCH] [dhcp_relay] Remove add field of vlanid to DHCP_RELAY table while add vlan (#2678) What I did Remove add field of vlanid to DHCP_RELAY table while add vlan which would cause conflict with yang model. How I did it Remove add field of vlanid to DHCP_RELAY table while add vlan How to verify it By unit tests Signed-off-by: Yaqiang Zhu --- config/vlan.py | 2 +- tests/vlan_test.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/vlan.py b/config/vlan.py index feb4fd2259..f1c6f06d1f 100644 --- a/config/vlan.py +++ b/config/vlan.py @@ -47,7 +47,7 @@ def add_vlan(db, vid): set_dhcp_relay_table('VLAN', config_db, vlan, {'vlanid': str(vid)}) # set dhcpv6_relay table - set_dhcp_relay_table('DHCP_RELAY', config_db, vlan, {'vlanid': str(vid)}) + set_dhcp_relay_table('DHCP_RELAY', config_db, vlan, None) # We need to restart dhcp_relay service after dhcpv6_relay config change dhcp_relay_util.handle_restart_dhcp_relay_service() diff --git a/tests/vlan_test.py b/tests/vlan_test.py index 85673c5020..f582d0e3ba 100644 --- a/tests/vlan_test.py +++ b/tests/vlan_test.py @@ -19,9 +19,6 @@ "table": "DHCP_RELAY" } } -DHCP_RELAY_TABLE_ENTRY = { - "vlanid": "1001" -} show_vlan_brief_output="""\ +-----------+-----------------+-----------------+----------------+-------------+ @@ -610,7 +607,8 @@ def test_config_add_del_vlan_dhcp_relay(self, ip_version, mock_restart_dhcp_rela print(result.output) assert result.exit_code == 0 - assert db.cfgdb.get_entry(IP_VERSION_PARAMS_MAP[ip_version]["table"], "Vlan1001") == DHCP_RELAY_TABLE_ENTRY + exp_output = {"vlanid": "1001"} if ip_version == "ipv4" else {} + assert db.cfgdb.get_entry(IP_VERSION_PARAMS_MAP[ip_version]["table"], "Vlan1001") == exp_output # del vlan 1001 result = runner.invoke(config.config.commands["vlan"].commands["del"], ["1001"], obj=db)