diff options
| -rw-r--r-- | interface-definitions/interfaces-macsec.xml.in | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-macsec.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-vxlan.py | 2 | ||||
| -rwxr-xr-x | src/migration-scripts/system/11-to-12 | 41 |
4 files changed, 24 insertions, 23 deletions
diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in index 9384726cc..068e31449 100644 --- a/interface-definitions/interfaces-macsec.xml.in +++ b/interface-definitions/interfaces-macsec.xml.in @@ -5,7 +5,7 @@ <tagNode name="macsec" owner="${vyos_conf_scripts_dir}/interfaces-macsec.py"> <properties> <help>MACsec Interface (802.1ae)</help> - <priority>319</priority> + <priority>461</priority> <constraint> <regex>^macsec[0-9]+$</regex> </constraint> diff --git a/src/conf_mode/interfaces-macsec.py b/src/conf_mode/interfaces-macsec.py index 0a20a121b..613648adb 100755 --- a/src/conf_mode/interfaces-macsec.py +++ b/src/conf_mode/interfaces-macsec.py @@ -97,7 +97,7 @@ def verify(macsec): lower_mtu = Interface(macsec['source_interface']).get_mtu() if lower_mtu < (int(macsec['mtu']) + 40): raise ConfigError('MACsec overhead does not fit into underlaying device MTU,\n' \ - f'{underlay_mtu} bytes is too small!') + f'{lower_mtu} bytes is too small!') return None diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py index 002f40aef..04e258fcf 100755 --- a/src/conf_mode/interfaces-vxlan.py +++ b/src/conf_mode/interfaces-vxlan.py @@ -76,7 +76,7 @@ def verify(vxlan): lower_mtu = Interface(vxlan['source_interface']).get_mtu() if lower_mtu < (int(vxlan['mtu']) + 50): raise ConfigError('VXLAN has a 50 byte overhead, underlaying device ' \ - f'MTU is to small ({underlay_mtu} bytes)') + f'MTU is to small ({lower_mtu} bytes)') verify_mtu_ipv6(vxlan) verify_address(vxlan) diff --git a/src/migration-scripts/system/11-to-12 b/src/migration-scripts/system/11-to-12 index 1a0233c7d..9cddaa1a7 100755 --- a/src/migration-scripts/system/11-to-12 +++ b/src/migration-scripts/system/11-to-12 @@ -37,31 +37,32 @@ else: # Migrate "system login radius-server" tag node to new # "system login radius server" tag node and also rename the "secret" node to "key" # - for server in config.list_nodes(cfg_base + ['radius-server']): - base_server = cfg_base + ['radius-server', server] - # "key" node is mandatory - key = config.return_value(base_server + ['secret']) - config.set(cfg_base + ['radius', 'server', server, 'key'], value=key) + if config.exists(cfg_base + ['radius-server']): + for server in config.list_nodes(cfg_base + ['radius-server']): + base_server = cfg_base + ['radius-server', server] + # "key" node is mandatory + key = config.return_value(base_server + ['secret']) + config.set(cfg_base + ['radius', 'server', server, 'key'], value=key) - # "port" is optional - if config.exists(base_server + ['port']): - port = config.return_value(base_server + ['port']) - config.set(cfg_base + ['radius', 'server', server, 'port'], value=port) + # "port" is optional + if config.exists(base_server + ['port']): + port = config.return_value(base_server + ['port']) + config.set(cfg_base + ['radius', 'server', server, 'port'], value=port) - # "timeout is optional" - if config.exists(base_server + ['timeout']): - timeout = config.return_value(base_server + ['timeout']) - config.set(cfg_base + ['radius', 'server', server, 'timeout'], value=timeout) + # "timeout is optional" + if config.exists(base_server + ['timeout']): + timeout = config.return_value(base_server + ['timeout']) + config.set(cfg_base + ['radius', 'server', server, 'timeout'], value=timeout) - # format as tag node - config.set_tag(cfg_base + ['radius', 'server']) + # format as tag node + config.set_tag(cfg_base + ['radius', 'server']) - # delete old configuration node - config.delete(base_server) + # delete old configuration node + config.delete(base_server) - # delete top level tag node - if config.exists(cfg_base + ['radius-server']): - config.delete(cfg_base + ['radius-server']) + # delete top level tag node + if config.exists(cfg_base + ['radius-server']): + config.delete(cfg_base + ['radius-server']) try: with open(file_name, 'w') as f: |