Run time option to attach test container to an existing docker network
Change-Id: I3dc84341eacf724eff762672370925cb6171d2f8
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 6fcd2d8..90004cb 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -1045,6 +1045,7 @@
type=str,
help='Specify the log level for the test cases')
parser_run.add_argument('-jvm-heap-size', '--jvm-heap-size', default='', type=str, help='ONOS JVM heap size')
+ parser_run.add_argument('-network', '--network', default='', type=str, help='Docker network to attach')
parser_run.set_defaults(func=runTest)
parser_setup = subparser.add_parser('setup', help='Setup cord tester environment')
@@ -1079,6 +1080,7 @@
help='Start ONOS cluster instances in async mode')
parser_setup.add_argument('-f', '--foreground', action='store_true', help='Run in foreground')
parser_setup.add_argument('-jvm-heap-size', '--jvm-heap-size', default='', type=str, help='ONOS JVM heap size')
+ parser_setup.add_argument('-network', '--network', default='', type=str, help='Docker network to attach')
parser_setup.set_defaults(func=setupCordTester)
parser_xos = subparser.add_parser('xos', help='Building xos into cord tester environment')
diff --git a/src/test/utils/TestManifest.py b/src/test/utils/TestManifest.py
index 74a95f6..fdd35ee 100644
--- a/src/test/utils/TestManifest.py
+++ b/src/test/utils/TestManifest.py
@@ -35,7 +35,7 @@
self.start_switch = args.start_switch
self.image_prefix = args.prefix
self.onos_image = args.onos
- self.docker_network = None
+ self.docker_network = args.network if args.network else None
self.iterations = None
self.server = '{}:{}'.format(CORD_TEST_HOST, CORD_TEST_PORT)
self.jvm_heap_size = args.jvm_heap_size if args.jvm_heap_size else None