Merge pull request #110 from intracom-telecom-sdn/release

Release
intracom-telecom-sdn · Feb 15, 2017 · 43bfbc4 · 43bfbc4
2 parents 778c736 + e08e785
commit 43bfbc4
Show file tree

Hide file tree

Showing 88 changed files with 28 additions and 109 deletions.
diff --git a/README.md b/README.md
@@ -5,6 +5,8 @@
 [![Issue Count](https://codeclimate.com/github/intracom-telecom-sdn/nstat/badges/issue_count.svg)](https://codeclimate.com/github/intracom-telecom-sdn/nstat)
 [![Code Health](https://landscape.io/github/intracom-telecom-sdn/nstat/master/landscape.svg?style=flat)](https://landscape.io/github/intracom-telecom-sdn/nstat/master)
 [![Coverage Status](https://coveralls.io/repos/intracom-telecom-sdn/nstat/badge.svg?branch=master&service=github)](https://coveralls.io/github/intracom-telecom-sdn/nstat?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/2c0663990de243a09e986d4f30b59dd3)](https://www.codacy.com/app/kostis-g-papadopoulos/nstat?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=intracom-telecom-sdn/nstat&amp;utm_campaign=Badge_Grade)
+[![Code Issues](https://www.quantifiedcode.com/api/v1/project/fcb21ff93ae24832a562595afafcd94f/badge.svg)](https://www.quantifiedcode.com/app/project/fcb21ff93ae24832a562595afafcd94f)
 
 # NSTAT: Network Stress-Test Automation Toolkit
 

diff --git a/controllers/odl_beryllium_pb/build.sh b/controllers/odl_beryllium_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_beryllium_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1

diff --git a/controllers/odl_beryllium_sr3_pb/build.sh b/controllers/odl_beryllium_sr3_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_beryllium_sr3_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1

diff --git a/controllers/odl_boron_pb/build.sh b/controllers/odl_boron_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_boron_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1

diff --git a/controllers/odl_boron_sr2_pb/build.sh b/controllers/odl_boron_sr2_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_boron_sr2_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1

diff --git a/controllers/odl_helium_sr3_pb/build.sh b/controllers/odl_helium_sr3_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_helium_sr3_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1

diff --git a/controllers/odl_lithium_sr1_pb/build.sh b/controllers/odl_lithium_sr1_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_lithium_sr1_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1

diff --git a/controllers/odl_lithium_sr2_pb/build.sh b/controllers/odl_lithium_sr2_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_lithium_sr2_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1

diff --git a/controllers/odl_lithium_sr3_pb/build.sh b/controllers/odl_lithium_sr3_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_lithium_sr3_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1

diff --git a/deploy/docker/no_proxy/Dockerfile b/deploy/docker/no_proxy/Dockerfile
@@ -18,6 +18,8 @@ RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/ss
 RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
+RUN mkdir -p /root/.ssh
+RUN touch /root/.ssh/known_hosts
 RUN mkdir -p /home/root/.ssh
 RUN touch /home/root/.ssh/known_hosts
 EXPOSE 22

diff --git a/deploy/docker/proxy/Dockerfile b/deploy/docker/proxy/Dockerfile
@@ -30,6 +30,8 @@ RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/ss
 RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
+RUN mkdir -p /root/.ssh
+RUN touch /root/.ssh/known_hosts
 RUN mkdir -p /home/root/.ssh
 RUN touch /home/root/.ssh/known_hosts
 EXPOSE 22

diff --git a/emulators/nb_generator/build.sh b/emulators/nb_generator/build.sh
@@ -10,21 +10,21 @@
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 echo $SCRIPT_DIR
 
-NSTAT_NB_GENERATOR_LOCATION="https://github.com/intracom-telecom-sdn/nstat-nb-generator.git"
+NSTAT_NB_EMULATOR_LOCATION="https://github.com/intracom-telecom-sdn/nstat-nb-emulator.git"
 
-if [ ! -d $SCRIPT_DIR"/nstat-nb-generator" ]; then
-    git clone -b master $NSTAT_NB_GENERATOR_LOCATION $SCRIPT_DIR"/nstat-nb-generator"
+if [ ! -d $SCRIPT_DIR"/nstat-nb-emulator" ]; then
+    git clone -b v.1.0 $NSTAT_NB_EMULATOR_LOCATION $SCRIPT_DIR"/nstat-nb-emulator"
     if [ $? -ne 0 ]; then
-        echo "[build.sh] Cloning nstat-nb-generator failed. Exiting ..."
+        echo "[build.sh] Cloning nstat-nb-emulator failed. Exiting ..."
         exit 1
     fi
-    rm -rf $SCRIPT_DIR"/nstat-nb-generator/.git"
-    mv $SCRIPT_DIR/nstat-nb-generator/* $SCRIPT_DIR
+    rm -rf $SCRIPT_DIR"/nstat-nb-emulator/.git"
+    mv $SCRIPT_DIR/nstat-nb-emulator/* $SCRIPT_DIR
     if [ $? -ne 0 ]; then
-        echo "[build.sh] Moving nstat-nb-generator files failed. Exiting ..."
+        echo "[build.sh] Moving nstat-nb-emulator files failed. Exiting ..."
         exit 1
     fi
-    rm -rf $SCRIPT_DIR/nstat-nb-generator
+    rm -rf $SCRIPT_DIR/nstat-nb-emulator
 fi
 
-echo "[build.sh] Building nstat-nb-generator completed successfully"
+echo "[build.sh] Building nstat-nb-emulator completed successfully"
diff --git a/emulators/nb_generator/clean.sh b/emulators/nb_generator/clean.sh
@@ -14,10 +14,10 @@ for item in $( ls -1 $SCRIPT_DIR ); do
     if [ $item != 'build.sh' ] && [ $item != 'clean.sh' ]; then
         rm -rf $SCRIPT_DIR/$item
         if [ $? -ne 0 ]; then
-            echo "[clean.sh] Cleanup of nstat-nb-generator failed. Exiting ..."
+            echo "[clean.sh] Cleanup of nstat-nb-emulator failed. Exiting ..."
             exit 1
         fi
     fi
 done
 
-echo "[clean.sh] Cleanup of nstat-nb-generator completed successfully"
+echo "[clean.sh] Cleanup of nstat-nb-emulator completed successfully"
diff --git a/stress_test/controller.py b/stress_test/controller.py
@@ -40,7 +40,6 @@ def __init__(self, ctrl_base_dir, test_config):
         self.ssh_user = test_config['controller_node_username']
         self.ssh_pass = test_config['controller_node_password']
 
-        self.need_cleanup = test_config['controller_cleanup']
         self.of_port = test_config['controller_port']
         self.logs_dir = self.base_dir + test_config['controller_logs_dir']
 

diff --git a/stress_test/monitor.py b/stress_test/monitor.py
@@ -665,7 +665,6 @@ def monitor_thread_active(self):
         results = self.system_results()
         results['global_sample_id'] = self.global_sample_id
         self.global_sample_id += 1
-        results['test_repeats'] = self.test_repeats
         results['multinet_workers'] = len(self.emulator.workers_ips)
         results['multinet_size'] = \
             self.emulator.topo_size * len(self.emulator.workers_ips)

diff --git a/stress_test/report_spec_templates.py b/stress_test/report_spec_templates.py
@@ -328,8 +328,7 @@ def sb_active_scalability_multinet(self, results_json_file):
             '{0}'.format(self.test_type),
             [stress_test.report_spec.TableSpec(
                 '1d', 'Test configuration parameters (detailed)',
-                [('test_repeats', 'Test repeats'),
-                 ('controller_name', 'Controller name'),
+                [('controller_name', 'Controller name'),
                  ('controller_build_handler', 'Controller build script'),
                  ('controller_start_handler', 'Controller start script'),
                  ('controller_stop_handler', 'Controller stop script'),
@@ -368,8 +367,6 @@ def sb_active_scalability_multinet(self, results_json_file):
                 [('global_sample_id', 'Sample ID'),
                  ('timestamp', 'Sample timestamp (seconds)'),
                  ('date', 'Sample timestamp (date)'),
-                 ('test_repeats', 'Total test repeats'),
-                 ('repeat_id', 'External repeat ID'),
                  ('of_out_bytes_per_sec',
                   'Outgoing controller throughput '
                   '(Bytes per second)'),

diff --git a/stress_test/sample_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/sample_test_confs/boron/boron_DS_sb_active_stability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_DS_sb_active_stability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/sample_test_confs/boron/boron_DS_sb_idle_scalability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_DS_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/sample_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/sample_test_confs/boron/boron_RPC_sb_active_stability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_RPC_sb_active_stability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/sample_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/sample_test_confs/boron/boron_nb_active_scalability_multinet.json b/stress_test/sample_test_confs/boron/boron_nb_active_scalability_multinet.json
@@ -40,7 +40,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/sample_test_confs/boron/boron_sb_active_scalability_multinet.json b/stress_test/sample_test_confs/boron/boron_sb_active_scalability_multinet.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
@@ -70,8 +69,6 @@
 
 "java_opts":["-Xmx2G","-Xms2G","-XX:+UseG1GC","-XX:MaxPermSize=512M"],
 
-"test_repeats":2,
-
 "plots":[
     {
         "x_axis_key":"multinet_size",

diff --git a/stress_test/sample_test_confs/boron/boron_sb_idle_scalability_multinet.json b/stress_test/sample_test_confs/boron/boron_sb_idle_scalability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/sample_test_confs/boron/boron_sb_idle_stability_multinet.json b/stress_test/sample_test_confs/boron/boron_sb_idle_stability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":2000,

diff --git a/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/...s/beryllium/beryllium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/...s/beryllium/beryllium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/.../beryllium/beryllium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/.../beryllium/beryllium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_idle_scalability_mtcbench.json b/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/stress_test_confs/beryllium/beryllium_nb_active_scalability_multinet.json b/stress_test/stress_test_confs/beryllium/beryllium_nb_active_scalability_multinet.json
@@ -40,7 +40,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL (Beryllium)",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/...test/stress_test_confs/beryllium/beryllium_sb_active_scalability_multinet_LinearTopo.json b/...test/stress_test_confs/beryllium/beryllium_sb_active_scalability_multinet_LinearTopo.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
@@ -70,8 +69,6 @@
 
 "java_opts":["-Xmx2G","-Xms2G","-XX:+UseG1GC","-XX:MaxPermSize=512M"],
 
-"test_repeats":2,
-
 "plots":[
     {
         "x_axis_key":"multinet_size",

diff --git a/.../stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_DisconnectedTopo.json b/.../stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_DisconnectedTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/...s_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_LinearTopo.json b/...s_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_LinearTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_stability_multinet.json b/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_stability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":5000,

diff --git a/stress_test/stress_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/...est_confs/boron/boron_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/...est_confs/boron/boron_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/stress_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/...st_confs/boron/boron_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/...st_confs/boron/boron_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],

diff --git a/stress_test/stress_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json b/stress_test/stress_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],