Revert "Fix for Switch Port Modes and VLAN CLI Enhancement (#3108)"

This reverts commit 92220dc.

config/main.py

@@ -57,7 +57,6 @@
 from .config_mgmt import ConfigMgmtDPB, ConfigMgmt
 from . import mclag
 from . import syslog
-from . import switchport
 from . import dns
 
 # mock masic APIs for unit test
@@ -106,7 +105,6 @@
 PORT_SPEED = "speed"
 PORT_TPID = "tpid"
 DEFAULT_TPID = "0x8100"
-PORT_MODE= "switchport_mode"
 
 DOM_CONFIG_SUPPORTED_SUBPORTS = ['0', '1']
 
@@ -1215,9 +1213,6 @@ def config(ctx):
 # DNS module
 config.add_command(dns.dns)
 
-# Switchport module
-config.add_command(switchport.switchport)
-
 @config.command()
 @click.option('-y', '--yes', is_flag=True, callback=_abort_if_false,
                 expose_value=False, prompt='Existing files will be overwritten, continue?')
@@ -4591,40 +4586,19 @@ def add(ctx, interface_name, ip_addr, gw):
         if interface_name is None:
             ctx.fail("'interface_name' is None!")
 
+    # Add a validation to check this interface is not a member in vlan before
+    # changing it to a router port
+    vlan_member_table = config_db.get_table('VLAN_MEMBER')
+    if (interface_is_in_vlan(vlan_member_table, interface_name)):
+        click.echo("Interface {} is a member of vlan\nAborting!".format(interface_name))
+        return
+
     portchannel_member_table = config_db.get_table('PORTCHANNEL_MEMBER')
 
     if interface_is_in_portchannel(portchannel_member_table, interface_name):
         ctx.fail("{} is configured as a member of portchannel."
                 .format(interface_name))
-
-
-    # Add a validation to check this interface is in routed mode before
-    # assigning an IP address to it
-
-    sub_intf = False
 
-    if clicommon.is_valid_port(config_db, interface_name):
-        is_port = True
-    elif clicommon.is_valid_portchannel(config_db, interface_name):
-        is_port = False
-    else:
-        sub_intf = True
-
-    if not sub_intf:
-        interface_mode = "routed"
-        if is_port:
-            interface_data = config_db.get_entry('PORT',interface_name)
-        elif not is_port:
-            interface_data = config_db.get_entry('PORTCHANNEL',interface_name)
-
-        if "mode" in interface_data:
-            interface_mode = interface_data["mode"]
-
-        if interface_mode != "routed":
-            ctx.fail("Interface {} is not in routed mode!".format(interface_name))
-            return
-
-
     try:
         ip_address = ipaddress.ip_interface(ip_addr)
     except ValueError as err: