Based on Jon Hall's feedback, bounce karaf default version to 3.0.8.
This is the default for the latest onosproject docker image on dockerhub.
Keep the karaf version for CiaB manifest on 3.0.5.
Add a manifest-cluster.json to spin up a 3 node ONOS cluster with cord-tester.
Change-Id: Ib5b238fd6e32dd46af37d2dd1db5841c1512e7fa
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 08eb528..3d0843c 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -1153,7 +1153,7 @@
parser_run.add_argument('-synchronizer', '--synchronizer', default='', type=str,
help='Specify the synchronizer to use for ONOS cord instance when running on podd.'
'Eg: vtn,fabric,cord')
- parser_run.add_argument('-karaf', '--karaf', default='3.0.5', type=str, help='Karaf version for ONOS')
+ parser_run.add_argument('-karaf', '--karaf', default='3.0.8', type=str, help='Karaf version for ONOS')
parser_run.set_defaults(func=runTest)
parser_setup = subparser.add_parser('setup', help='Setup cord tester environment')
@@ -1195,7 +1195,7 @@
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.add_argument('-karaf', '--karaf', default='3.0.5', type=str, help='Karaf version for ONOS')
+ parser_setup.add_argument('-karaf', '--karaf', default='3.0.8', type=str, help='Karaf version for ONOS')
parser_setup.set_defaults(func=setupCordTester)
parser_xos = subparser.add_parser('xos', help='Building xos into cord tester environment')
diff --git a/src/test/setup/manifest-cluster.json b/src/test/setup/manifest-cluster.json
new file mode 100644
index 0000000..e311473
--- /dev/null
+++ b/src/test/setup/manifest-cluster.json
@@ -0,0 +1,9 @@
+{
+ "onos_instances": 3,
+ "olt": true,
+ "start_switch": true,
+ "onos_image": "onosproject/onos:latest",
+ "log_level" : "INFO",
+ "jvm_heap_size" : "1G",
+ "karaf_version" : "3.0.8"
+}
diff --git a/src/test/setup/manifest-cord.json b/src/test/setup/manifest-cord.json
index a83be39..d4222a6 100644
--- a/src/test/setup/manifest-cord.json
+++ b/src/test/setup/manifest-cord.json
@@ -9,5 +9,6 @@
"synchronizer" : "vtn",
"docker_network" : "onoscord_default",
"log_level" : "INFO",
- "jvm_heap_size" : "1G"
+ "jvm_heap_size" : "1G",
+ "karaf_version" : "3.0.5"
}
diff --git a/src/test/setup/manifest-fabric.json b/src/test/setup/manifest-fabric.json
index 07c176a..e8cce31 100644
--- a/src/test/setup/manifest-fabric.json
+++ b/src/test/setup/manifest-fabric.json
@@ -9,5 +9,6 @@
"synchronizer" : "vtn",
"docker_network" : "onosfabric_default",
"log_level" : "INFO",
- "jvm_heap_size" : "1G"
+ "jvm_heap_size" : "1G",
+ "karaf_version" : "3.0.5"
}
diff --git a/src/test/setup/manifest.json b/src/test/setup/manifest.json
index d9bb2e4..a957602 100644
--- a/src/test/setup/manifest.json
+++ b/src/test/setup/manifest.json
@@ -5,5 +5,5 @@
"onos_image": "onosproject/onos:latest",
"log_level" : "INFO",
"jvm_heap_size" : "1G",
- "karaf_version" : "3.0.5"
+ "karaf_version" : "3.0.8"
}
diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 0c30833..cd31827 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -463,12 +463,12 @@
('igmp', '1.1-SNAPSHOT'),
#('vtn', '1.1-SNAPSHOT'),
)
- ports = [] #[ 8181, 8101, 9876, 6653, 6633, 2000, 2620 ]
+ ports = [] #[ 8181, 8101, 9876, 6653, 6633, 2000, 2620, 5005 ]
setup_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'setup')
host_config_dir = os.path.join(setup_dir, 'onos-config')
guest_config_dir = '/root/onos/config'
- guest_data_dir = '/root/onos/apache-karaf-3.0.5/data'
- guest_log_file = '/root/onos/apache-karaf-3.0.5/data/log/karaf.log'
+ guest_data_dir = '/root/onos/apache-karaf-3.0.8/data'
+ guest_log_file = '/root/onos/apache-karaf-3.0.8/data/log/karaf.log'
onos_gen_partitions = os.path.join(setup_dir, 'onos-gen-partitions')
onos_form_cluster = os.path.join(setup_dir, 'onos-form-cluster')
cord_apps_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'apps')
diff --git a/src/test/utils/OnosLog.py b/src/test/utils/OnosLog.py
index 15fb216..bc25434 100644
--- a/src/test/utils/OnosLog.py
+++ b/src/test/utils/OnosLog.py
@@ -6,7 +6,7 @@
CLI_USER = 'karaf'
CLI_PASSWD = 'karaf'
CLI_PORT = 8101
- KARAF_VERSION = os.getenv('KARAF_VERSION', '3.0.5')
+ KARAF_VERSION = os.getenv('KARAF_VERSION', '3.0.8')
HOST = os.getenv('ONOS_CONTROLLER_IP', '172.17.0.2').split(',')[0]
last_snapshot_map = {}
diff --git a/src/test/utils/TestManifest.py b/src/test/utils/TestManifest.py
index 143727c..88f9a67 100644
--- a/src/test/utils/TestManifest.py
+++ b/src/test/utils/TestManifest.py
@@ -73,4 +73,4 @@
self.server = data.get('test_server', '{}:{}'.format(CORD_TEST_HOST, CORD_TEST_PORT))
self.iterations = data.get('iterations', None)
self.jvm_heap_size = data.get('jvm_heap_size', None)
- self.karaf_version = data.get('karaf_version', '3.0.5')
+ self.karaf_version = data.get('karaf_version', '3.0.8')