commit e723209c88d745b3766dacb81baa580adcf168a6
author A R Karthick <kramanar@ciena.com> Thu Sep 07 18:01:33 2017 -0700
committer A R Karthick <kramanar@ciena.com> Thu Sep 07 18:01:33 2017 -0700
tree cd8f55d00c81763e2774cd0673b5519dd3267a07
parent 1555c7c816f7a437207c126a3c41dd5a05e7ea55

Move cord-tester voltha rest interface to use envoy.
Plus other misc. changes

Change-Id: I03c40841ef07d9c0523799dc2efbd7e0caa1e536

src/test/utils/OnosCtrl.py

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

src/test/utils/VolthaCtrl.py

diff --git a/src/test/utils/VolthaCtrl.py b/src/test/utils/VolthaCtrl.py
index 41ef8dc..7d6e2b5 100644
--- a/src/test/utils/VolthaCtrl.py
+++ b/src/test/utils/VolthaCtrl.py
@@ -26,7 +26,7 @@
 
 class VolthaService(object):
     services = ('consul', 'kafka', 'zookeeper', 'registrator', 'fluentd')
-    standalone_services = ('voltha', 'ofagent', 'vcli',)
+    standalone_services = ('envoy', 'voltha', 'ofagent', 'vcli',)
     compose_file = 'docker-compose-system-test.yml'
     service_map = {}
     PROJECT = 'cordtester'
@@ -211,7 +211,7 @@
 class VolthaCtrl(object):
     UPLINK_VLAN_START = 333
     UPLINK_VLAN_MAP = { 'of:0000000000000001' : '222' }
-    REST_PORT = 8881
+    REST_PORT = 8882
     HOST = '172.17.0.1'
     ONOS_APPS = ('org.onosproject.dhcp', 'org.onosproject.dhcp-relay', 'org.ciena.cordigmp')
     ADMIN_STATE = 'admin_state'
@@ -225,9 +225,9 @@
         self.rest_url = 'http://{}:{}/api/v1/local'.format(host, rest_port)
         if rest_port == 8882:
             self.rest_url = 'http://{}:{}/api/v1'.format(host, rest_port)
-            self.ADMIN_STATE = 'adminState'
-            self.OPER_STATUS = 'operStatus'
-            self.CONNECT_STATUS = 'connectStatus'
+            #self.ADMIN_STATE = 'adminState'
+            #self.OPER_STATUS = 'operStatus'
+            #self.CONNECT_STATUS = 'connectStatus'
         self.uplink_vlan_map = uplink_vlan_map
         VolthaCtrl.UPLINK_VLAN_START = uplink_vlan_start
         self.switches = []