commit a6c88fdfa201a3ea564261ace3f7fff34a57545d
author A.R Karthick <kramanar@ciena.com> Mon Mar 13 09:29:41 2017 -0700
committer A.R Karthick <kramanar@ciena.com> Mon Mar 13 09:29:41 2017 -0700
tree f6e8200d28965bd41b7b4103f0e4d10da45b898b
parent a652c4ad37194736b76ba09bcec0d87571584149

Update cord-config and igmp app to version 1.2.
Update all test files to use the right AAA config app name pertaining to 1.2 aaa.

Change-Id: Ia393d9aee4dd124e46614bde2e39e64266708745

src/test/utils/Cluster.py

diff --git a/src/test/utils/Cluster.py b/src/test/utils/Cluster.py
index 21120a4..b55d4e2 100644
--- a/src/test/utils/Cluster.py
+++ b/src/test/utils/Cluster.py
@@ -299,10 +299,10 @@
 
     def onos_aaa_config(self,controller=None):
 	log.info('controller in onos_aaa_config is %s'%controller)
-        aaa_dict = {'apps' : { 'org.onosproject.aaa' : { 'AAA' : { 'radiusSecret': 'radius_password',
-                                                                   'radiusIp': '172.17.0.2' } } } }
+        aaa_dict = {'apps' : { 'org.opencord.aaa' : { 'AAA' : { 'radiusSecret': 'radius_password',
+                                                                'radiusIp': '172.17.0.2' } } } }
         radius_ip = os.getenv('ONOS_AAA_IP') or '172.17.0.2'
-        aaa_dict['apps']['org.onosproject.aaa']['AAA']['radiusIp'] = radius_ip
+        aaa_dict['apps']['org.opencord.aaa']['AAA']['radiusIp'] = radius_ip
         self.onos_ctrl.activate()
         time.sleep(2)
         self.onos_load_config(aaa_dict,controller=controller)
@@ -1805,11 +1805,11 @@
 	    log.info('controller ip in cluster.py onos_aaa_load is %s'%controller)
             if self.aaa_loaded:
                   return
-            aaa_dict = {'apps' : { 'org.onosproject.aaa' : { 'AAA' : { 'radiusSecret': 'radius_password',
-                                                                       'radiusIp': '172.17.0.2' } } } }
+            aaa_dict = {'apps' : { 'org.opencord.aaa' : { 'AAA' : { 'radiusSecret': 'radius_password',
+                                                                    'radiusIp': '172.17.0.2' } } } }
             radius_ip = os.getenv('ONOS_AAA_IP') or '172.17.0.2'
-            aaa_dict['apps']['org.onosproject.aaa']['AAA']['radiusIp'] = radius_ip
-            self.onos_load_config('org.onosproject.aaa', aaa_dict,controller=controller)
+            aaa_dict['apps']['org.opencord.aaa']['AAA']['radiusIp'] = radius_ip
+            self.onos_load_config('org.opencord.aaa', aaa_dict,controller=controller)
             self.aaa_loaded = True
 
       def onos_dhcp_table_load(self, config = None,controller=None):
@@ -2543,4 +2543,3 @@
                 log.info('Getting dhcp client IP %s from server %s for mac %s with lease time %s. That is not 700.' %
                          (cip, sip, mac, lval) )
                 assert_not_equal(lval, 700)
-

src/test/utils/CordContainer.py

diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 10616eb..6339cf0 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -542,10 +542,9 @@
     JAVA_OPTS_DEFAULT = JAVA_OPTS_FORMAT.format(*SYSTEM_MEMORY) #-XX:+PrintGCDetails -XX:+PrintGCTimeStamps'
     JAVA_OPTS_CLUSTER_DEFAULT = JAVA_OPTS_FORMAT.format(*INSTANCE_MEMORY)
     env = { 'ONOS_APPS' : 'drivers,openflow,proxyarp,vrouter', 'JAVA_OPTS' : JAVA_OPTS_DEFAULT }
-    onos_cord_apps = ( ('cord-config', '1.1-SNAPSHOT'),
+    onos_cord_apps = ( ('cord-config', '1.2-SNAPSHOT'),
                        ('aaa', '1.2-SNAPSHOT'),
-                       ('igmp', '1.1-SNAPSHOT'),
-                       #('vtn', '1.1-SNAPSHOT'),
+                       ('igmp', '1.2-SNAPSHOT'),
                        )
     ports = [] #[ 8181, 8101, 9876, 6653, 6633, 2000, 2620, 5005 ]
     setup_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'setup')