Move cord-tester voltha rest interface to use envoy.
Plus other misc. changes
Change-Id: I03c40841ef07d9c0523799dc2efbd7e0caa1e536
diff --git a/src/test/utils/OnosCtrl.py b/src/test/utils/OnosCtrl.py
index 1742f43..a2daf20 100644
--- a/src/test/utils/OnosCtrl.py
+++ b/src/test/utils/OnosCtrl.py
@@ -330,7 +330,13 @@
radius_ip = '{}.{}'.format(radius_subnet, radius_port)
aaa_cfg['radiusIp'] = radius_ip
for dev in ovs_devices:
- connect_point = '{}/{}'.format(dev['id'], radius_port)
+ device_id = dev['id']
+ ports = OnosCtrl.get_ports_device(device_id, controller = controller)
+ radius_ports = filter(lambda p: p['isEnabled'] and 'annotations' in p and \
+ p['annotations']['portName'].startswith('r'),
+ ports)
+ radius_port = radius_ports[0]['port']
+ connect_point = '{}/{}'.format(device_id, radius_port)
connect_points.append(connect_point)
aaa_cfg['radiusServerConnectPoints'] = connect_points
break