Fix test assertions and add test for VLAN ranges

Co-authored-by: qkalsky <[email protected]>

Author: Copilot

tests/networking/cisco/command_actions/test_iface_actions.py

@@ -83,16 +83,17 @@ def test_clean_interface_switchport_config_preserves_vlan_1(self, cte_mock):
 
         # Verify that execute_command was called for other switchport lines but not for vlan 1
         calls = executor_mock.execute_command.call_args_list
-        # Should be called twice: once for "switchport" and once for "switchport mode dynamic auto"
+        # Should be called once for "switchport mode dynamic auto"
         # but NOT for "switchport trunk allowed vlan 1"
-        self.assertEqual(len(calls), 2)
+        # Note: "switchport" alone (without trailing space) is not matched by the pattern
+        self.assertEqual(len(calls), 1)
 
-        # Verify the commands that were issued
+        # Verify the command that was issued
         called_commands = [call[1]["command"] for call in calls]
-        self.assertIn("switchport", called_commands)
         self.assertIn("switchport mode dynamic auto", called_commands)
-        # Ensure vlan 1 command was NOT called
-        self.assertNotIn("switchport trunk allowed vlan", called_commands)
+        # Ensure vlan 1 line was NOT processed (would appear as "switchport trunk allowed vlan" after regex)
+        for cmd in called_commands:
+            self.assertNotIn("trunk allowed vlan", cmd)
 
     @patch(
         "cloudshell.networking.cisco.command_actions.iface_actions"
@@ -118,11 +119,42 @@ def test_clean_interface_switchport_config_removes_other_vlans(self, cte_mock):
 
         # Verify that execute_command was called for all switchport lines including vlan 100
         calls = executor_mock.execute_command.call_args_list
-        # Should be called three times: "switchport", "switchport trunk allowed vlan", "switchport mode trunk"
-        self.assertEqual(len(calls), 3)
+        # Should be called twice: "switchport trunk allowed vlan", "switchport mode trunk"
+        # Note: "switchport" alone (without trailing space) is not matched by the pattern
+        self.assertEqual(len(calls), 2)
 
         # Verify the commands that were issued
         called_commands = [call[1]["command"] for call in calls]
-        self.assertIn("switchport", called_commands)
+        self.assertIn("switchport trunk allowed vlan", called_commands)
+        self.assertIn("switchport mode trunk", called_commands)
+
+    @patch(
+        "cloudshell.networking.cisco.command_actions.iface_actions"
+        ".CommandTemplateExecutor"
+    )
+    def test_clean_interface_switchport_config_removes_vlan_1_in_range(self, cte_mock):
+        """Test that VLAN 1 in a range or list is still removed (not default state)."""
+        current_config = """Building configuration...
+
+Current configuration : 144 bytes
+!
+interface GigabitEthernet110/1/0/6
+ description Test Port
+ switchport trunk allowed vlan 1,2,3
+ switchport mode trunk
+end
+"""
+        executor_mock = MagicMock()
+        cte_mock.return_value = executor_mock
+
+        self._handler.clean_interface_switchport_config(current_config)
+
+        # Verify that execute_command was called for VLAN range including vlan 1
+        calls = executor_mock.execute_command.call_args_list
+        # Should be called twice: "switchport trunk allowed vlan", "switchport mode trunk"
+        self.assertEqual(len(calls), 2)
+
+        # Verify the commands that were issued - vlan 1,2,3 should be removed
+        called_commands = [call[1]["command"] for call in calls]
         self.assertIn("switchport trunk allowed vlan", called_commands)
         self.assertIn("switchport mode trunk", called_commands)