diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-06-05 09:45:04 -0500 | 
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-06-05 11:29:00 -0500 | 
| commit | 2ce55816aad83d34a0b9c85db03410e7d0512ed1 (patch) | |
| tree | ac8f86ddf55eb8ab2c9be1e26d64f467e56f83e5 | |
| parent | 12b7da289665c75c3839b32c77a491d8909f3e73 (diff) | |
| download | vyos-1x-2ce55816aad83d34a0b9c85db03410e7d0512ed1.tar.gz vyos-1x-2ce55816aad83d34a0b9c85db03410e7d0512ed1.zip | |
openconnect: T5259: fix migration logic in delete_value radius|local
Incorrect logic of node deletion now raises error, after T5251.
| -rwxr-xr-x | src/migration-scripts/openconnect/1-to-2 | 14 | 
1 files changed, 7 insertions, 7 deletions
| diff --git a/src/migration-scripts/openconnect/1-to-2 b/src/migration-scripts/openconnect/1-to-2 index 7031fb252..51cd6bc37 100755 --- a/src/migration-scripts/openconnect/1-to-2 +++ b/src/migration-scripts/openconnect/1-to-2 @@ -39,13 +39,13 @@ if not config.exists(cfg_base):  else:      if config.exists(cfg_base + ['authentication', 'mode']):          if config.return_value(cfg_base + ['authentication', 'mode']) == 'radius': -            # if "mode value radius", change to "tag node mode + valueless node radius" -            config.delete(cfg_base + ['authentication','mode', 'radius']) -            config.set(cfg_base + ['authentication', 'mode', 'radius'], value=None, replace=True) -        elif not config.exists(cfg_base + ['authentication', 'mode', 'local']): -            # if "mode local", change to "tag node mode + node local value password" -            config.delete(cfg_base + ['authentication', 'mode', 'local']) -            config.set(cfg_base + ['authentication', 'mode', 'local'], value='password', replace=True) +            # if "mode value radius", change to "mode + valueless node radius" +            config.delete_value(cfg_base + ['authentication','mode'], 'radius') +            config.set(cfg_base + ['authentication', 'mode', 'radius'], value=None) +        elif config.return_value(cfg_base + ['authentication', 'mode']) == 'local': +            # if "mode local", change to "mode + node local value password" +            config.delete_value(cfg_base + ['authentication', 'mode'], 'local') +            config.set(cfg_base + ['authentication', 'mode', 'local'], value='password')      try:          with open(file_name, 'w') as f:              f.write(config.to_string()) | 
