Support in cord-tester for aaa-proxy using sadis app.
And various other changes that moves support for aaa to ONOS 1.10.3 and upwards.
Change-Id: Id911812caf2e1c1bd78107e57175d190241812ff
diff --git a/src/test/utils/OltConfig.py b/src/test/utils/OltConfig.py
index f2496ea..71ac056 100644
--- a/src/test/utils/OltConfig.py
+++ b/src/test/utils/OltConfig.py
@@ -107,6 +107,8 @@
relay_ports = num_ports
port_map['relay_ports'] = []
port_map['switch_relay_port_list'] = []
+ port_map['radius_ports'] = []
+ port_map['switch_radius_port_list'] = []
for sw in xrange(nr_switches):
port_list = []
switch = port_map['switches'][sw]
@@ -117,6 +119,15 @@
port_map['relay_ports'].append(port_name)
port_list.append(port_name)
port_map['switch_relay_port_list'].append( (switch, port_list) )
+ for sw in xrange(nr_switches):
+ switch = port_map['switches'][sw]
+ if not switch.startswith('br-int'):
+ continue
+ port_name = 'veth{}'.format(port_end)
+ port_list = [ port_name ]
+ port_map['switch_radius_port_list'].append( (switch, port_list) )
+ port_map['radius_ports'].append(port_name)
+ port_end += 2
port_num = 1
port_map['uplink'] = int(self.olt_conf['uplink'])
port_map['wan'] = None
@@ -143,6 +154,10 @@
port_map[port_num] = port
port_map[port] = port_num
port_num += 1
+ for port in port_map['radius_ports']:
+ port_map[port_num] = port
+ port_map[port] = port_num
+ port_num += 1
port_map['start_vlan'] = 0
if self.olt_conf['port_map'].has_key('start_vlan'):
port_map['start_vlan'] = int(self.olt_conf['port_map']['start_vlan'])