diff --git a/netplan_cli/cli/sriov.py b/netplan_cli/cli/sriov.py index dbec83142..b84807a3e 100644 --- a/netplan_cli/cli/sriov.py +++ b/netplan_cli/cli/sriov.py @@ -375,12 +375,6 @@ def apply_sriov_config(config_manager, rootdir='/'): Go through all interfaces, identify which ones are SR-IOV VFs, create them and perform all other necessary setup. """ - parser = netplan.Parser() - parser.load_yaml_hierarchy(rootdir) - - np_state = netplan.State() - np_state.import_parser_results(parser) - config_manager.parse() interfaces = netifaces.interfaces() np_state = config_manager.np_state diff --git a/tests/test_sriov.py b/tests/test_sriov.py index 119489dfe..b48ec74c3 100644 --- a/tests/test_sriov.py +++ b/tests/test_sriov.py @@ -24,7 +24,6 @@ from collections import defaultdict from unittest.mock import patch, mock_open, call -import netplan import netplan_cli.cli.sriov as sriov from netplan_cli.configmanager import ConfigManager, ConfigurationError @@ -578,7 +577,7 @@ def test_apply_sriov_config_invalid_vlan(self, gim, gidn, apply_vlan, quirks, gim.return_value = '00:01:02:03:04:05' # call method under test - with self.assertRaises(netplan.NetplanValidationException) as e: + with self.assertRaises(ConfigurationError) as e: sriov.apply_sriov_config(self.configmanager, rootdir=self.workdir.name) self.assertIn('vf1.15: missing \'id\' property', str(e.exception))