Added support for mode attribute in IP config commands and updated the

MuhammadUmarAsad · MuhammadUmarAsad · commit cd13da3eeec0 · 2022-12-11T02:12:56.000+05:00
related testcase

removed the fucntionality for checking vlan status to assign IP Address
It will now assign IP Address if the port is in 'routed' mode else it won't assign

Signed-off-by: Muhammad Umar Asad &lt;umar.asad@xflowresearch.com&gt; xFlow Research Inc.
diff --git a/config/main.py b/config/main.py
@@ -4321,11 +4321,21 @@ 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))
+    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
+    interface_mode = "routed"
+    interface_data = config_db.get_entry('PORT',interface_name)
+    if "mode" in interface_data:
+        interface_mode = interface_data["mode"]
+
+    if interface_mode != "routed":
+        click.echo("Interface {} is not in routed mode.\nRemove the vlans assigned to it and changed mode to routed\nAborting".format(interface_name))
         return
 
     try:
diff --git a/config/switchport.py b/config/switchport.py
@@ -18,7 +18,10 @@ def switchport():
 @click.argument("port", metavar="port", required=True)
 @clicommon.pass_db
 def switchport_mode(db, type, port):
-    """switchport mode help commands\nmode_type can either be:\n\t -> access \n\t -> trunk \n\t -> routed"""
+    """switchport mode help commands. mode_type can either be:
+        -> access
+        -> trunk
+        -> routed"""
 
     ctx = click.get_current_context()
 
@@ -53,8 +56,7 @@ def switchport_mode(db, type, port):
     if (is_port and clicommon.interface_is_in_portchannel(portchannel_member_table, port)):
         ctx.fail("{} is part of portchannel!".format(port))
 
-    port_table_data = db.cfgdb.get_table('PORT')
-    port_data = port_table_data[port]
+    port_data = db.cfgdb.get_entry('PORT',port)
 
     # mode type is either access or trunk
     if type != "routed":
diff --git a/config/vlan.py b/config/vlan.py
@@ -250,8 +250,7 @@ def add_vlan_member(db, vid, port, untagged, multiple, except_flag):
             
             # checking mode status of port if its access, trunk or routed
             if is_port:
-                port_table_data = db.cfgdb.get_table('PORT')
-                port_data = port_table_data[port]
+                port_data = config_db.get_entry('PORT',port)
 
                 if "mode" not in port_data: 
                     ctx.fail("{} is in routed mode!\nUse switchport mode command to change port mode".format(port))
diff --git a/tests/vlan_test.py b/tests/vlan_test.py
@@ -1248,7 +1248,7 @@ def test_config_set_router_port_on_member_interface(self):
                                ["Ethernet4", "10.10.10.1/24"], obj=obj)        
         print(result.exit_code, result.output)
         assert result.exit_code == 0
-        assert 'Interface Ethernet4 is a member of vlan' in result.output
+        assert 'Interface Ethernet4 is not in routed mode.\nRemove the vlans assigned to it and changed mode to routed' in result.output
         
     def test_config_vlan_add_member_of_portchannel(self):
         runner = CliRunner()
