commit b608d40478d21592ac3d1713b3f3236d834a853d
author A R Karthick <kramanar@ciena.com> Fri Jun 02 11:48:41 2017 -0700
committer A R Karthick <kramanar@ciena.com> Fri Jun 02 11:48:41 2017 -0700
tree bca25cdbd8ef7cf9dc2781021969a3c0a542ee1e
parent 79c813e965edbc339278fa73ea94a23e862fd6a7

Install the right ONOS and cord-tester apps based on ONOS version.
Install a 1.1 olt app for ONOS 1.8 versions.

Change-Id: Id6255b897a95474f41ddf39fa067413c43731684

src/test/cordSubscriber/cordSubscriberTest.py

diff --git a/src/test/cordSubscriber/cordSubscriberTest.py b/src/test/cordSubscriber/cordSubscriberTest.py
index 1cffe67..f4f5df8 100644
--- a/src/test/cordSubscriber/cordSubscriberTest.py
+++ b/src/test/cordSubscriber/cordSubscriberTest.py
@@ -39,6 +39,7 @@
 from CordTestUtils import log_test, get_controller
 from CordLogger import CordLogger
 from CordTestConfig import setup_module
+from CordContainer import Onos
 
 log_test.setLevel('INFO')
 
@@ -275,6 +276,26 @@
       VOLTHA_ENABLED = bool(int(os.getenv('VOLTHA_ENABLED', 0)))
 
       @classmethod
+      def update_apps_version(cls):
+            version = Onos.getVersion()
+            major = int(version.split('.')[0])
+            minor = int(version.split('.')[1])
+            cordigmp_app_version = '2.0-SNAPSHOT'
+            olt_app_version = '1.2-SNAPSHOT'
+            if major > 1:
+                  cordigmp_app_version = '3.0-SNAPSHOT'
+                  olt_app_version = '2.0-SNAPSHOT'
+            elif major == 1:
+                  if minor > 10:
+                        cordigmp_app_version = '3.0-SNAPSHOT'
+                        olt_app_version = '2.0-SNAPSHOT'
+                  elif minor <= 8:
+                        olt_app_version = '1.1-SNAPSHOT'
+            cls.app_file = os.path.join(cls.test_path, '..', 'apps/ciena-cordigmp-{}.oar'.format(cordigmp_app_version))
+            cls.table_app_file = os.path.join(cls.test_path, '..', 'apps/ciena-cordigmp-multitable-{}.oar'.format(cordigmp_app_version))
+            cls.olt_app_file = os.path.join(cls.test_path, '..', 'apps/olt-app-{}.oar'.format(olt_app_version))
+
+      @classmethod
       def load_device_id(cls):
             '''Configure the device id'''
             did = OnosCtrl.get_device_id()
@@ -293,6 +314,7 @@
       @classmethod
       def setUpClass(cls):
           '''Load the OLT config and activate relevant apps'''
+          cls.update_apps_version()
           dids = OnosCtrl.get_device_ids()
           device_map = {}
           for did in dids: