commit 36a7593339968330d106d6b6bc8ad11aa50590d8
author A R Karthick <kramanar@ciena.com> Wed Oct 25 14:40:42 2017 -0700
committer A R Karthick <kramanar@ciena.com> Wed Oct 25 14:40:42 2017 -0700
tree 066d5bf3a05508c27e8340f2e81c8ddce363fc81
parent d4d954f6b182f51ea7d72ea695413d79c45e02c5

Move onos cord synchronizer apps to 1.4.0.

Change-Id: Ida9ccc4094f219b87bbb21623fdb83d2ef587843

src/test/utils/CordContainer.py

diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 572ef16..707a9f8 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -336,8 +336,8 @@
     """Use this when running the cord tester agent on the onos compute node"""
     onos_config_dir_guest = '/root/onos/config'
     synchronizer_map = { 'vtn' : { 'install':
-                      ('http://mavenrepo:8080/repository/org/opencord/cord-config/1.2-SNAPSHOT/cord-config-1.2-SNAPSHOT.oar',
-                       'http://mavenrepo:8080/repository/org/opencord/vtn/1.2-SNAPSHOT/vtn-1.2-SNAPSHOT.oar',),
+                      ('http://mavenrepo:8080/repository/org/opencord/cord-config/1.4.0-SNAPSHOT/cord-config-1.4.0-SNAPSHOT.oar',
+                       'http://mavenrepo:8080/repository/org/opencord/vtn/1.4.0-SNAPSHOT/vtn-1.4.0-SNAPSHOT.oar',),
                                    'activate':
                                    ('org.onosproject.ovsdb-base', 'org.onosproject.drivers.ovsdb',
                                     'org.onosproject.dhcp', 'org.onosproject.optical-model',
@@ -351,8 +351,8 @@
                                        'org.onosproject.segmentrouting', 'org.onosproject.proxyarp'),
                                       }
                          }
-    tester_apps = ('http://mavenrepo:8080/repository/org/opencord/aaa/1.2-SNAPSHOT/aaa-1.2-SNAPSHOT.oar',
-                   'http://mavenrepo:8080/repository/org/opencord/igmp/1.2-SNAPSHOT/igmp-1.2-SNAPSHOT.oar',)
+    tester_apps = ('http://mavenrepo:8080/repository/org/opencord/aaa/1.4.0-SNAPSHOT/aaa-1.4.0-SNAPSHOT.oar',
+                   'http://mavenrepo:8080/repository/org/opencord/igmp/1.4.0-SNAPSHOT/igmp-1.4.0-SNAPSHOT.oar',)
 
     old_service_profile = '/opt/cord/orchestration/service-profile/cord-pod'
     cord_profile = '/opt/cord_profile'

src/test/utils/OnosCtrl.py

diff --git a/src/test/utils/OnosCtrl.py b/src/test/utils/OnosCtrl.py
index 21dbe74..7cc4f66 100644
--- a/src/test/utils/OnosCtrl.py
+++ b/src/test/utils/OnosCtrl.py
@@ -343,6 +343,8 @@
                 radius_ports = filter(lambda p: p['isEnabled'] and 'annotations' in p and \
                                       p['annotations']['portName'].startswith('r'),
                                       ports)
+                if not radius_ports:
+                    continue
                 radius_port = radius_ports[0]['port']
                 connect_point = '{}/{}'.format(device_id, radius_port)
                 connect_points.append(connect_point)