commit 09dbc6d5de611078fdbc37a4554849a760f0b3be
author A R Karthick <kramanar@ciena.com> Tue Nov 22 10:37:42 2016 -0800
committer A R Karthick <kramanar@ciena.com> Tue Nov 22 10:37:42 2016 -0800
tree 3cb5e004d2424d2fa6236c9e657ec5862bc99547
parent 1ef70559666134114215a89591168fb416971232

Shared volume option for cord-tester enables starting cord-tester in cluster mode with shared ONOS data volume.

Change-Id: I6e3af87d165030ff6b872b9ae1f4a82e071135bb

src/test/setup/cord-test.py

diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index adfebad..252216d 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -404,7 +404,7 @@
         Onos.IMAGE = onos_cnt['image']
         Onos.PREFIX = args.prefix
         Onos.TAG = onos_cnt['tag']
-        data_volume = '{}-data'.format(Onos.NAME)
+        data_volume = '{}-data'.format(Onos.NAME) if args.shared_volume else None
         onos = Onos(image = Onos.IMAGE,
                     tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode, data_volume = data_volume)
         onos_ip = onos.ip()
@@ -415,7 +415,7 @@
         onos_instances.append(onos)
         for i in range(1, num_onos_instances):
             name = '{}-{}'.format(Onos.NAME, i+1)
-            data_volume = '{}-data'.format(name)
+            data_volume = '{}-data'.format(name) if args.shared_volume else None
             onos = Onos(name = name, image = Onos.IMAGE, tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode,
                         data_volume = data_volume)
             onos_instances.append(onos)
@@ -630,7 +630,7 @@
     cluster_mode = True if args.onos_instances > 1 else False
     onos = None
     if onos_ip is None:
-        data_volume = '{}-data'.format(Onos.NAME)
+        data_volume = '{}-data'.format(Onos.NAME) if args.shared_volume else None
         onos = Onos(image = Onos.IMAGE, tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode,
                     data_volume = data_volume)
         onos_ip = onos.ip()
@@ -642,7 +642,7 @@
         onos_instances.append(onos)
         for i in range(1, num_onos_instances):
             name = '{}-{}'.format(Onos.NAME, i+1)
-            data_volume = '{}-data'.format(name)
+            data_volume = '{}-data'.format(name) if args.shared_volume else None
             onos = Onos(name = name, image = Onos.IMAGE, tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode,
                         data_volume = data_volume)
             onos_instances.append(onos)
@@ -950,6 +950,7 @@
                             type=str, help='ssh identity file to access compute nodes from test container')
     parser_run.add_argument('-j', '--onos-instances', default=1, type=int,
                             help='Specify number to test onos instances to form cluster')
+    parser_run.add_argument('-v', '--shared-volume', action='store_true', help='Start ONOS cluster instances with shared volume')
     parser_run.set_defaults(func=runTest)
 
 
@@ -976,6 +977,8 @@
                               type=str, help='ssh identity file to access compute nodes from test container')
     parser_setup.add_argument('-n', '--onos-instances', default=1, type=int,
                               help='Specify number of test onos instances to spawn')
+    parser_setup.add_argument('-v', '--shared-volume', action='store_true',
+                              help='Start ONOS cluster instances with shared volume')
     parser_setup.add_argument('-f', '--foreground', action='store_true', help='Run in foreground')
     parser_setup.set_defaults(func=setupCordTester)