diff options
| -rw-r--r-- | smoketest/configs/ipoe-server | 1 | ||||
| -rwxr-xr-x | src/migration-scripts/ipoe-server/0-to-1 | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/smoketest/configs/ipoe-server b/smoketest/configs/ipoe-server index 7699dbcb9..a375e91de 100644 --- a/smoketest/configs/ipoe-server +++ b/smoketest/configs/ipoe-server @@ -32,6 +32,7 @@ service { download 1000 upload 500 } + vlan-id 100 } } interface eth2 { diff --git a/src/migration-scripts/ipoe-server/0-to-1 b/src/migration-scripts/ipoe-server/0-to-1 index da1f3f761..d768758ba 100755 --- a/src/migration-scripts/ipoe-server/0-to-1 +++ b/src/migration-scripts/ipoe-server/0-to-1 @@ -45,6 +45,12 @@ if config.exists(base + ['authentication', 'interface']): for interface in config.list_nodes(base + ['authentication', 'interface']): config.rename(base + ['authentication', 'interface', interface, 'mac-address'], 'mac') + mac_base = base + ['authentication', 'interface', interface, 'mac'] + for mac in config.list_nodes(mac_base): + vlan_config = mac_base + [mac, 'vlan-id'] + if config.exists(vlan_config): + config.rename(vlan_config, 'vlan') + for interface in config.list_nodes(base + ['interface']): base_path = base + ['interface', interface] for vlan in ['vlan-id', 'vlan-range']: |