|
6 | 6 | from click.testing import CliRunner |
7 | 7 |
|
8 | 8 | import config.main as config |
| 9 | +import config.vlan as vlan |
9 | 10 |
|
10 | 11 | import show.main as show |
11 | 12 | from utilities_common.db import Db |
@@ -693,31 +694,31 @@ def test_config_switchport_mode_with_mirror_destintion_port(self): |
693 | 694 | assert result.exit_code != 0 |
694 | 695 | assert "Error: Ethernet44 is configured as mirror destination port" in result.output |
695 | 696 |
|
696 | | - |
697 | 697 | @patch("config.validated_config_db_connector.validated_set_entry", mock.Mock(side_effect=JsonPatchConflict)) |
698 | 698 | @patch("validated_config_db_connector.device_info.is_yang_config_validation_enabled", mock.Mock(return_value=True)) |
699 | 699 | def test_config_vlan_add_member_yang_validation(self): |
700 | 700 |
|
701 | | - config.ADHOC_VALIDATION = False |
| 701 | + vlan.ADHOC_VALIDATION = False |
702 | 702 | runner = CliRunner() |
703 | 703 | db = Db() |
704 | 704 | obj = {'db': db.cfgdb} |
705 | 705 | result = runner.invoke(config.config.commands["vlan"].commands["member"].commands["add"], |
706 | 706 | ["1000", "Ethernet1"], obj=obj) |
707 | 707 | print(result.exit_code) |
708 | 708 | assert result.exit_code != 0 |
709 | | - assert "Error: Vlan1000 invalid or does not exist, or Ethernet1 invalid or does not exist" in result.output |
710 | 709 |
|
711 | 710 | @patch("validated_config_db_connector.device_info.is_yang_config_validation_enabled", mock.Mock(return_value=True)) |
712 | | - @patch("config.validated_config_db_connector.ValidatedConfigDBConnector.validated_set_entry", mock.Mock(side_effect=ValueError)) |
| 711 | + @patch("config.validated_config_db_connector.ValidatedConfigDBConnector.validated_set_entry", |
| 712 | + mock.Mock(side_effect=ValueError)) |
713 | 713 | def test_config_vlan_del_member_yang_validation(self): |
714 | | - config.ADHOC_VALIDATION = False |
| 714 | + vlan.ADHOC_VALIDATION = False |
715 | 715 | runner = CliRunner() |
716 | 716 | db = Db() |
717 | 717 | obj = {'db': db.cfgdb} |
718 | 718 | result = runner.invoke(config.config.commands["vlan"].commands["member"].commands["del"], |
719 | 719 | ["1000", "Ethernet1"], obj=obj) |
720 | 720 | print(result.exit_code) |
| 721 | + assert result.exit_code != 0 |
721 | 722 | assert "Error: Vlan1000 invalid or does not exist, or Ethernet1 invalid or does not exist" in result.output |
722 | 723 |
|
723 | 724 | def test_config_vlan_add_portchannel_member_with_switchport_modes(self): |
|
0 commit comments