[vlan] Vlan deletion is not allowed when there are members assigned to this VLAN.

Signed-off-by: allas <[email protected]>

Author: allas-nvidia

config/vlan.py

@@ -53,8 +53,10 @@ def del_vlan(db, vid):
             ctx.fail("{} can not be removed. First remove IP addresses assigned to this VLAN".format(vlan))
 
     keys = [ (k, v) for k, v in db.cfgdb.get_table('VLAN_MEMBER') if k == 'Vlan{}'.format(vid) ]
-    for k in keys:
-        db.cfgdb.set_entry('VLAN_MEMBER', k, None)
+    
+    if keys:
+        ctx.fail("VLAN ID {} can not be removed. First remove all members assigned to this VLAN.".format(vid))
+        
     db.cfgdb.set_entry('VLAN', 'Vlan{}'.format(vid), None)
 
 def restart_ndppd():

tests/vlan_test.py

@@ -337,6 +337,21 @@ def test_config_vlan_del_vlan(self):
         print(result.exit_code, result.output)
         assert result.exit_code != 0
 
+        # del vlan with IP
+        result = runner.invoke(config.config.commands["vlan"].commands["del"], ["1000"], obj=db)
+        print(result.exit_code)
+        print(result.output)
+        assert result.exit_code != 0
+        assert "Error: VLAN ID 1000 can not be removed. First remove all members assigned to this VLAN." in result.output
+
+        vlan_member = db.cfgdb.get_table('VLAN_MEMBER')
+        keys = [ (k, v) for k, v in vlan_member if k == 'Vlan{}'.format(1000) ]
+        for k,v in keys:    
+            result = runner.invoke(config.config.commands["vlan"].commands["member"].commands["del"], ["1000", v], obj=db)
+            print(result.exit_code)
+            print(result.output)
+            assert result.exit_code == 0
+
         result = runner.invoke(config.config.commands["vlan"].commands["del"], ["1000"], obj=db)
         print(result.exit_code)
         print(result.output)