diff options
| -rwxr-xr-x | smoketest/scripts/cli/test_interfaces_vxlan.py | 14 | ||||
| -rwxr-xr-x | src/op_mode/image_installer.py | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/smoketest/scripts/cli/test_interfaces_vxlan.py b/smoketest/scripts/cli/test_interfaces_vxlan.py index 694c24e4d..132496124 100755 --- a/smoketest/scripts/cli/test_interfaces_vxlan.py +++ b/smoketest/scripts/cli/test_interfaces_vxlan.py @@ -125,19 +125,17 @@ class VXLANInterfaceTest(BasicInterfaceTest.TestCase): 'source-interface eth0', 'vni 60' ] - params = [] for option in options: opts = option.split() - params.append(opts[0]) - self.cli_set(self._base_path + [ intf ] + opts) + self.cli_set(self._base_path + [intf] + opts) - with self.assertRaises(ConfigSessionError) as cm: + # verify() - Both group and remote cannot be specified + with self.assertRaises(ConfigSessionError): self.cli_commit() - exception = cm.exception - self.assertIn('Both group and remote cannot be specified', str(exception)) - for param in params: - self.cli_delete(self._base_path + [intf, param]) + # Remove blocking CLI option + self.cli_delete(self._base_path + [intf, 'group']) + self.cli_commit() def test_vxlan_external(self): diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index 540967c1f..3af2232bb 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -491,6 +491,8 @@ def get_cli_kernel_options(config_file: str) -> list: config = ConfigTree(read_file(config_file)) config_dict = loads(config.to_json()) kernel_options = dict_search('system.option.kernel', config_dict) + if kernel_options is None: + kernel_options = {} cmdline_options = [] # XXX: This code path and if statements must be kept in sync with the Kernel |