commit a652c4ad37194736b76ba09bcec0d87571584149
author A R Karthick <kramanar@ciena.com> Fri Mar 10 17:47:08 2017 -0800
committer A R Karthick <kramanar@ciena.com> Fri Mar 10 17:47:08 2017 -0800
tree a75724630c5d1b5e1cf5d6df548329d421dc8e6e
parent eeac7e1dfa2bdccae451c09059c6371b81aa3b88

Update aaa app to 1.2. Change TLS AAA config appname

Change-Id: Iab8f6cc61dab52314aeb7875f02d1d81b9ad61c5

src/test/apps/aaa-1.2-SNAPSHOT.oar

diff --git a/src/test/apps/aaa-1.2-SNAPSHOT.oar b/src/test/apps/aaa-1.2-SNAPSHOT.oar
new file mode 100644
index 0000000..2d0c9dc
--- /dev/null
+++ b/src/test/apps/aaa-1.2-SNAPSHOT.oar
Binary files differ

src/test/tls/tlsTest.py

diff --git a/src/test/tls/tlsTest.py b/src/test/tls/tlsTest.py
index c50b2a1..f659f0f 100644
--- a/src/test/tls/tlsTest.py
+++ b/src/test/tls/tlsTest.py
@@ -79,10 +79,10 @@
         self.onos_aaa_config()
 
     def onos_aaa_config(self):
-        aaa_dict = {'apps' : { 'org.onosproject.aaa' : { 'AAA' : { 'radiusSecret': 'radius_password',
-                                                                   'radiusIp': '172.17.0.2' } } } }
+        aaa_dict = {'apps' : { self.app : { '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'][self.app]['AAA']['radiusIp'] = radius_ip
         self.onos_ctrl.activate()
         time.sleep(2)
         self.onos_load_config(aaa_dict)

src/test/utils/CordContainer.py

diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 0db31ad..10616eb 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -543,7 +543,7 @@
     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'),
-                       ('aaa', '1.1-SNAPSHOT'),
+                       ('aaa', '1.2-SNAPSHOT'),
                        ('igmp', '1.1-SNAPSHOT'),
                        #('vtn', '1.1-SNAPSHOT'),
                        )