[dhcp_relay] Remove add field of vlanid to DHCP_RELAY table while add vlan (sonic-net#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 <[email protected]>

Author: yaqiangz

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()
 

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)