kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nehanarkh...@apache.org
Subject [3/3] git commit: KAFKA-1725 Configuration file bugs in system tests add noise to output and break a few tests; reviewed by Neha Narkhede
Date Fri, 24 Oct 2014 16:04:37 GMT
KAFKA-1725 Configuration file bugs in system tests add noise to output and break a few tests; reviewed by Neha Narkhede


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/12ce4b1e
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/12ce4b1e
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/12ce4b1e

Branch: refs/heads/trunk
Commit: 12ce4b1e1e0e6ec7fd3585baf3ed531ecc16a5d9
Parents: e402c7b
Author: Ewen Cheslack-Postava <me@ewencp.org>
Authored: Fri Oct 24 09:04:14 2014 -0700
Committer: Neha Narkhede <neha.narkhede@gmail.com>
Committed: Fri Oct 24 09:04:23 2014 -0700

----------------------------------------------------------------------
 .../testcase_15001_properties.json              | 158 ++++++++++++++++
 .../testcase_5001_properties.json               | 158 ----------------
 .../testcase_15002_properties.json              | 158 ++++++++++++++++
 .../testcase_5002_properties.json               | 158 ----------------
 .../testcase_15003_properties.json              | 156 ++++++++++++++++
 .../testcase_5003_properties.json               | 156 ----------------
 .../testcase_15004_properties.json              | 156 ++++++++++++++++
 .../testcase_5004_properties.json               | 156 ----------------
 .../testcase_15005_properties.json              | 178 +++++++++++++++++++
 .../testcase_5005_properties.json               | 178 -------------------
 .../testcase_15006_properties.json              | 178 +++++++++++++++++++
 .../testcase_5006_properties.json               | 178 -------------------
 .../testcase_0001/testcase_0001_properties.json |   2 +-
 .../testcase_0101_properties.json               |  86 ---------
 .../testcase_10101_properties.json              |  86 +++++++++
 .../testcase_0102_properties.json               |  86 ---------
 .../testcase_10102_properties.json              |  86 +++++++++
 .../testcase_0103_properties.json               |  86 ---------
 .../testcase_10103_properties.json              |  86 +++++++++
 .../testcase_0104_properties.json               |  86 ---------
 .../testcase_10104_properties.json              |  86 +++++++++
 .../testcase_0105_properties.json               |  86 ---------
 .../testcase_10105_properties.json              |  86 +++++++++
 .../testcase_0106_properties.json               |  86 ---------
 .../testcase_10106_properties.json              |  86 +++++++++
 .../testcase_0107_properties.json               |  86 ---------
 .../testcase_10107_properties.json              |  86 +++++++++
 .../testcase_0108_properties.json               |  86 ---------
 .../testcase_10108_properties.json              |  86 +++++++++
 .../testcase_0109_properties.json               |  86 ---------
 .../testcase_10109_properties.json              |  86 +++++++++
 .../testcase_0110_properties.json               |  86 ---------
 .../testcase_10110_properties.json              |  86 +++++++++
 .../testcase_0131_properties.json               | 110 ------------
 .../testcase_10131_properties.json              | 110 ++++++++++++
 .../testcase_0132_properties.json               | 107 -----------
 .../testcase_10132_properties.json              | 107 +++++++++++
 .../testcase_0133_properties.json               | 107 -----------
 .../testcase_10133_properties.json              | 107 +++++++++++
 .../testcase_0134_properties.json               |  92 ----------
 .../testcase_10134_properties.json              |  92 ++++++++++
 system_test/utils/metrics.py                    |   2 +
 topics.json                                     |   4 +
 43 files changed, 2267 insertions(+), 2261 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15001/testcase_15001_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15001/testcase_15001_properties.json b/system_test/mirror_maker_testsuite/testcase_15001/testcase_15001_properties.json
new file mode 100644
index 0000000..9dd3477
--- /dev/null
+++ b/system_test/mirror_maker_testsuite/testcase_15001/testcase_15001_properties.json
@@ -0,0 +1,158 @@
+{
+  "description": {"01":"To Test : 'Replication with Mirror Maker'",
+                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
+                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
+                  "04":"Produce and consume messages to a single topic - single partition.",
+                  "05":"This test sends messages to 3 replicas",
+                  "06":"At the end it verifies the log size and contents",
+                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
+                  "08":"Producer dimensions : mode:sync, acks:-1, comp:0",
+                  "09":"Log segment size    : 10240"
+  },
+  "testcase_args": {
+    "bounce_leader": "false",
+    "bounce_mirror_maker": "false",
+    "replica_factor": "3",
+    "num_partition": "1",
+    "num_iteration": "1",
+    "sleep_seconds_between_producer_calls": "1",
+    "message_producing_free_time_sec": "15",
+    "num_messages_to_produce_per_producer_call": "50"
+  },
+  "entities": [
+    {
+      "entity_id": "0",
+      "clientPort": "2108",
+      "dataDir": "/tmp/zookeeper_0",
+      "log_filename": "zookeeper_0.log",
+      "config_filename": "zookeeper_0.properties"
+    },
+    {
+      "entity_id": "1",
+      "clientPort": "2118",
+      "dataDir": "/tmp/zookeeper_1",
+      "log_filename": "zookeeper_1.log",
+      "config_filename": "zookeeper_1.properties"
+    },
+
+    {
+      "entity_id": "2",
+      "clientPort": "2128",
+      "dataDir": "/tmp/zookeeper_2",
+      "log_filename": "zookeeper_2.log",
+      "config_filename": "zookeeper_2.properties"
+    },
+    {
+      "entity_id": "3",
+      "clientPort": "2138",
+      "dataDir": "/tmp/zookeeper_3",
+      "log_filename": "zookeeper_3.log",
+      "config_filename": "zookeeper_3.properties"
+    },
+
+    {
+      "entity_id": "4",
+      "port": "9091",
+      "broker.id": "1",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_4_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_4.log",
+      "config_filename": "kafka_server_4.properties"
+    },
+    {
+      "entity_id": "5",
+      "port": "9092",
+      "broker.id": "2",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_5_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_5.log",
+      "config_filename": "kafka_server_5.properties"
+    },
+    {
+      "entity_id": "6",
+      "port": "9093",
+      "broker.id": "3",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_6_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_6.log",
+      "config_filename": "kafka_server_6.properties"
+    },
+    {
+      "entity_id": "7",
+      "port": "9094",
+      "broker.id": "4",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_7_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_7.log",
+      "config_filename": "kafka_server_7.properties"
+    },
+    {
+      "entity_id": "8",
+      "port": "9095",
+      "broker.id": "5",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_8_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_8.log",
+      "config_filename": "kafka_server_8.properties"
+    },
+    {
+      "entity_id": "9",
+      "port": "9096",
+      "broker.id": "6",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_9_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_9.log",
+      "config_filename": "kafka_server_9.properties"
+    },
+
+    {
+      "entity_id": "10",
+      "topic": "test_1",
+      "threads": "5",
+      "compression-codec": "0",
+      "message-size": "500",
+      "message": "500",
+      "request-num-acks": "-1",
+      "sync":"true",
+      "producer-num-retries":"5",
+      "log_filename": "producer_performance_10.log",
+      "config_filename": "producer_performance_10.properties"
+    },
+    {
+      "entity_id": "11",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_11.log",
+      "config_filename": "console_consumer_11.properties"
+    },
+
+    {
+      "entity_id": "12",
+      "log_filename": "mirror_maker_12.log",
+      "mirror_consumer_config_filename": "mirror_consumer_12.properties",
+      "mirror_producer_config_filename": "mirror_producer_12.properties"
+    },
+
+    {
+      "entity_id": "13",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_13.log",
+      "config_filename": "console_consumer_13.properties"
+    }
+   ]
+}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15001/testcase_5001_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15001/testcase_5001_properties.json b/system_test/mirror_maker_testsuite/testcase_15001/testcase_5001_properties.json
deleted file mode 100644
index 9dd3477..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15001/testcase_5001_properties.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-  "description": {"01":"To Test : 'Replication with Mirror Maker'",
-                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
-                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
-                  "04":"Produce and consume messages to a single topic - single partition.",
-                  "05":"This test sends messages to 3 replicas",
-                  "06":"At the end it verifies the log size and contents",
-                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
-                  "08":"Producer dimensions : mode:sync, acks:-1, comp:0",
-                  "09":"Log segment size    : 10240"
-  },
-  "testcase_args": {
-    "bounce_leader": "false",
-    "bounce_mirror_maker": "false",
-    "replica_factor": "3",
-    "num_partition": "1",
-    "num_iteration": "1",
-    "sleep_seconds_between_producer_calls": "1",
-    "message_producing_free_time_sec": "15",
-    "num_messages_to_produce_per_producer_call": "50"
-  },
-  "entities": [
-    {
-      "entity_id": "0",
-      "clientPort": "2108",
-      "dataDir": "/tmp/zookeeper_0",
-      "log_filename": "zookeeper_0.log",
-      "config_filename": "zookeeper_0.properties"
-    },
-    {
-      "entity_id": "1",
-      "clientPort": "2118",
-      "dataDir": "/tmp/zookeeper_1",
-      "log_filename": "zookeeper_1.log",
-      "config_filename": "zookeeper_1.properties"
-    },
-
-    {
-      "entity_id": "2",
-      "clientPort": "2128",
-      "dataDir": "/tmp/zookeeper_2",
-      "log_filename": "zookeeper_2.log",
-      "config_filename": "zookeeper_2.properties"
-    },
-    {
-      "entity_id": "3",
-      "clientPort": "2138",
-      "dataDir": "/tmp/zookeeper_3",
-      "log_filename": "zookeeper_3.log",
-      "config_filename": "zookeeper_3.properties"
-    },
-
-    {
-      "entity_id": "4",
-      "port": "9091",
-      "broker.id": "1",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_4_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_4.log",
-      "config_filename": "kafka_server_4.properties"
-    },
-    {
-      "entity_id": "5",
-      "port": "9092",
-      "broker.id": "2",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_5_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_5.log",
-      "config_filename": "kafka_server_5.properties"
-    },
-    {
-      "entity_id": "6",
-      "port": "9093",
-      "broker.id": "3",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_6_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_6.log",
-      "config_filename": "kafka_server_6.properties"
-    },
-    {
-      "entity_id": "7",
-      "port": "9094",
-      "broker.id": "4",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_7_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_7.log",
-      "config_filename": "kafka_server_7.properties"
-    },
-    {
-      "entity_id": "8",
-      "port": "9095",
-      "broker.id": "5",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_8_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_8.log",
-      "config_filename": "kafka_server_8.properties"
-    },
-    {
-      "entity_id": "9",
-      "port": "9096",
-      "broker.id": "6",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_9_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_9.log",
-      "config_filename": "kafka_server_9.properties"
-    },
-
-    {
-      "entity_id": "10",
-      "topic": "test_1",
-      "threads": "5",
-      "compression-codec": "0",
-      "message-size": "500",
-      "message": "500",
-      "request-num-acks": "-1",
-      "sync":"true",
-      "producer-num-retries":"5",
-      "log_filename": "producer_performance_10.log",
-      "config_filename": "producer_performance_10.properties"
-    },
-    {
-      "entity_id": "11",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_11.log",
-      "config_filename": "console_consumer_11.properties"
-    },
-
-    {
-      "entity_id": "12",
-      "log_filename": "mirror_maker_12.log",
-      "mirror_consumer_config_filename": "mirror_consumer_12.properties",
-      "mirror_producer_config_filename": "mirror_producer_12.properties"
-    },
-
-    {
-      "entity_id": "13",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_13.log",
-      "config_filename": "console_consumer_13.properties"
-    }
-   ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15002/testcase_15002_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15002/testcase_15002_properties.json b/system_test/mirror_maker_testsuite/testcase_15002/testcase_15002_properties.json
new file mode 100644
index 0000000..d6495e5
--- /dev/null
+++ b/system_test/mirror_maker_testsuite/testcase_15002/testcase_15002_properties.json
@@ -0,0 +1,158 @@
+{
+  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
+                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
+                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
+                  "04":"Produce and consume messages to a single topic - single partition.",
+                  "05":"This test sends messages to 3 replicas",
+                  "06":"At the end it verifies the log size and contents",
+                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
+                  "08":"Producer dimensions : mode:sync, acks:-1, comp:0",
+                  "09":"Log segment size    : 20480"
+  },
+  "testcase_args": {
+    "bounce_leader": "false",
+    "bounce_mirror_maker": "true",
+    "replica_factor": "3",
+    "num_partition": "1",
+    "num_iteration": "1",
+    "sleep_seconds_between_producer_calls": "1",
+    "message_producing_free_time_sec": "15",
+    "num_messages_to_produce_per_producer_call": "50"
+  },
+  "entities": [
+    {
+      "entity_id": "0",
+      "clientPort": "2108",
+      "dataDir": "/tmp/zookeeper_0",
+      "log_filename": "zookeeper_0.log",
+      "config_filename": "zookeeper_0.properties"
+    },
+    {
+      "entity_id": "1",
+      "clientPort": "2118",
+      "dataDir": "/tmp/zookeeper_1",
+      "log_filename": "zookeeper_1.log",
+      "config_filename": "zookeeper_1.properties"
+    },
+
+    {
+      "entity_id": "2",
+      "clientPort": "2128",
+      "dataDir": "/tmp/zookeeper_2",
+      "log_filename": "zookeeper_2.log",
+      "config_filename": "zookeeper_2.properties"
+    },
+    {
+      "entity_id": "3",
+      "clientPort": "2138",
+      "dataDir": "/tmp/zookeeper_3",
+      "log_filename": "zookeeper_3.log",
+      "config_filename": "zookeeper_3.properties"
+    },
+
+    {
+      "entity_id": "4",
+      "port": "9091",
+      "broker.id": "1",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_4_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_4.log",
+      "config_filename": "kafka_server_4.properties"
+    },
+    {
+      "entity_id": "5",
+      "port": "9092",
+      "broker.id": "2",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_5_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_5.log",
+      "config_filename": "kafka_server_5.properties"
+    },
+    {
+      "entity_id": "6",
+      "port": "9093",
+      "broker.id": "3",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_6_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_6.log",
+      "config_filename": "kafka_server_6.properties"
+    },
+    {
+      "entity_id": "7",
+      "port": "9094",
+      "broker.id": "4",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_7_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_7.log",
+      "config_filename": "kafka_server_7.properties"
+    },
+    {
+      "entity_id": "8",
+      "port": "9095",
+      "broker.id": "5",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_8_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_8.log",
+      "config_filename": "kafka_server_8.properties"
+    },
+    {
+      "entity_id": "9",
+      "port": "9096",
+      "broker.id": "6",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_9_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_9.log",
+      "config_filename": "kafka_server_9.properties"
+    },
+
+    {
+      "entity_id": "10",
+      "topic": "test_1",
+      "threads": "5",
+      "compression-codec": "0",
+      "message-size": "500",
+      "message": "100",
+      "request-num-acks": "-1",
+      "sync":"true",
+      "producer-num-retries":"5",
+      "log_filename": "producer_performance_10.log",
+      "config_filename": "producer_performance_10.properties"
+    },
+    {
+      "entity_id": "11",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_11.log",
+      "config_filename": "console_consumer_11.properties"
+    },
+
+    {
+      "entity_id": "12",
+      "log_filename": "mirror_maker_12.log",
+      "mirror_consumer_config_filename": "mirror_consumer_12.properties",
+      "mirror_producer_config_filename": "mirror_producer_12.properties"
+    },
+
+    {
+      "entity_id": "13",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_13.log",
+      "config_filename": "console_consumer_13.properties"
+    }
+   ]
+}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15002/testcase_5002_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15002/testcase_5002_properties.json b/system_test/mirror_maker_testsuite/testcase_15002/testcase_5002_properties.json
deleted file mode 100644
index d6495e5..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15002/testcase_5002_properties.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
-                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
-                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
-                  "04":"Produce and consume messages to a single topic - single partition.",
-                  "05":"This test sends messages to 3 replicas",
-                  "06":"At the end it verifies the log size and contents",
-                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
-                  "08":"Producer dimensions : mode:sync, acks:-1, comp:0",
-                  "09":"Log segment size    : 20480"
-  },
-  "testcase_args": {
-    "bounce_leader": "false",
-    "bounce_mirror_maker": "true",
-    "replica_factor": "3",
-    "num_partition": "1",
-    "num_iteration": "1",
-    "sleep_seconds_between_producer_calls": "1",
-    "message_producing_free_time_sec": "15",
-    "num_messages_to_produce_per_producer_call": "50"
-  },
-  "entities": [
-    {
-      "entity_id": "0",
-      "clientPort": "2108",
-      "dataDir": "/tmp/zookeeper_0",
-      "log_filename": "zookeeper_0.log",
-      "config_filename": "zookeeper_0.properties"
-    },
-    {
-      "entity_id": "1",
-      "clientPort": "2118",
-      "dataDir": "/tmp/zookeeper_1",
-      "log_filename": "zookeeper_1.log",
-      "config_filename": "zookeeper_1.properties"
-    },
-
-    {
-      "entity_id": "2",
-      "clientPort": "2128",
-      "dataDir": "/tmp/zookeeper_2",
-      "log_filename": "zookeeper_2.log",
-      "config_filename": "zookeeper_2.properties"
-    },
-    {
-      "entity_id": "3",
-      "clientPort": "2138",
-      "dataDir": "/tmp/zookeeper_3",
-      "log_filename": "zookeeper_3.log",
-      "config_filename": "zookeeper_3.properties"
-    },
-
-    {
-      "entity_id": "4",
-      "port": "9091",
-      "broker.id": "1",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_4_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_4.log",
-      "config_filename": "kafka_server_4.properties"
-    },
-    {
-      "entity_id": "5",
-      "port": "9092",
-      "broker.id": "2",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_5_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_5.log",
-      "config_filename": "kafka_server_5.properties"
-    },
-    {
-      "entity_id": "6",
-      "port": "9093",
-      "broker.id": "3",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_6_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_6.log",
-      "config_filename": "kafka_server_6.properties"
-    },
-    {
-      "entity_id": "7",
-      "port": "9094",
-      "broker.id": "4",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_7_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_7.log",
-      "config_filename": "kafka_server_7.properties"
-    },
-    {
-      "entity_id": "8",
-      "port": "9095",
-      "broker.id": "5",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_8_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_8.log",
-      "config_filename": "kafka_server_8.properties"
-    },
-    {
-      "entity_id": "9",
-      "port": "9096",
-      "broker.id": "6",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_9_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_9.log",
-      "config_filename": "kafka_server_9.properties"
-    },
-
-    {
-      "entity_id": "10",
-      "topic": "test_1",
-      "threads": "5",
-      "compression-codec": "0",
-      "message-size": "500",
-      "message": "100",
-      "request-num-acks": "-1",
-      "sync":"true",
-      "producer-num-retries":"5",
-      "log_filename": "producer_performance_10.log",
-      "config_filename": "producer_performance_10.properties"
-    },
-    {
-      "entity_id": "11",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_11.log",
-      "config_filename": "console_consumer_11.properties"
-    },
-
-    {
-      "entity_id": "12",
-      "log_filename": "mirror_maker_12.log",
-      "mirror_consumer_config_filename": "mirror_consumer_12.properties",
-      "mirror_producer_config_filename": "mirror_producer_12.properties"
-    },
-
-    {
-      "entity_id": "13",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_13.log",
-      "config_filename": "console_consumer_13.properties"
-    }
-   ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15003/testcase_15003_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15003/testcase_15003_properties.json b/system_test/mirror_maker_testsuite/testcase_15003/testcase_15003_properties.json
new file mode 100644
index 0000000..842c70e
--- /dev/null
+++ b/system_test/mirror_maker_testsuite/testcase_15003/testcase_15003_properties.json
@@ -0,0 +1,156 @@
+{
+  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
+                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
+                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
+                  "04":"Produce and consume messages to a single topic - single partition.",
+                  "05":"This test sends messages to 3 replicas",
+                  "06":"At the end it verifies the log size and contents",
+                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
+                  "08":"Producer dimensions : mode:async, acks:-1, comp:1",
+                  "09":"Log segment size    : 20480"
+  },
+  "testcase_args": {
+    "bounce_leader": "false",
+    "bounce_mirror_maker": "true",
+    "bounced_entity_downtime_sec": "30",
+    "replica_factor": "3",
+    "num_partition": "1",
+    "num_iteration": "1",
+    "sleep_seconds_between_producer_calls": "1",
+    "message_producing_free_time_sec": "15",
+    "num_messages_to_produce_per_producer_call": "50"
+  },
+  "entities": [
+    {
+      "entity_id": "0",
+      "clientPort": "2108",
+      "dataDir": "/tmp/zookeeper_0",
+      "log_filename": "zookeeper_0.log",
+      "config_filename": "zookeeper_0.properties"
+    },
+    {
+      "entity_id": "1",
+      "clientPort": "2118",
+      "dataDir": "/tmp/zookeeper_1",
+      "log_filename": "zookeeper_1.log",
+      "config_filename": "zookeeper_1.properties"
+    },
+
+    {
+      "entity_id": "2",
+      "clientPort": "2128",
+      "dataDir": "/tmp/zookeeper_2",
+      "log_filename": "zookeeper_2.log",
+      "config_filename": "zookeeper_2.properties"
+    },
+    {
+      "entity_id": "3",
+      "clientPort": "2138",
+      "dataDir": "/tmp/zookeeper_3",
+      "log_filename": "zookeeper_3.log",
+      "config_filename": "zookeeper_3.properties"
+    },
+
+    {
+      "entity_id": "4",
+      "port": "9091",
+      "broker.id": "1",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_4_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_4.log",
+      "config_filename": "kafka_server_4.properties"
+    },
+    {
+      "entity_id": "5",
+      "port": "9092",
+      "broker.id": "2",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_5_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_5.log",
+      "config_filename": "kafka_server_5.properties"
+    },
+    {
+      "entity_id": "6",
+      "port": "9093",
+      "broker.id": "3",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_6_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_6.log",
+      "config_filename": "kafka_server_6.properties"
+    },
+    {
+      "entity_id": "7",
+      "port": "9094",
+      "broker.id": "4",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_7_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_7.log",
+      "config_filename": "kafka_server_7.properties"
+    },
+    {
+      "entity_id": "8",
+      "port": "9095",
+      "broker.id": "5",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_8_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_8.log",
+      "config_filename": "kafka_server_8.properties"
+    },
+    {
+      "entity_id": "9",
+      "port": "9096",
+      "broker.id": "6",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_9_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_9.log",
+      "config_filename": "kafka_server_9.properties"
+    },
+
+    {
+      "entity_id": "10",
+      "topic": "test_1",
+      "threads": "5",
+      "compression-codec": "2",
+      "message-size": "500",
+      "message": "100",
+      "request-num-acks": "-1",
+      "sync":"false",
+      "producer-num-retries":"5",
+      "log_filename": "producer_performance_10.log",
+      "config_filename": "producer_performance_10.properties"
+    },
+    {
+      "entity_id": "11",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_11.log",
+      "config_filename": "console_consumer_11.properties"
+    },
+
+    {
+      "entity_id": "12",
+      "log_filename": "mirror_maker_12.log",
+      "mirror_consumer_config_filename": "mirror_consumer_12.properties",
+      "mirror_producer_config_filename": "mirror_producer_12.properties"
+    },
+    {
+      "entity_id": "13",
+      "log_filename": "mirror_maker_13.log",
+      "mirror_consumer_config_filename": "mirror_consumer_13.properties",
+      "mirror_producer_config_filename": "mirror_producer_13.properties"
+    }
+   ]
+}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15003/testcase_5003_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15003/testcase_5003_properties.json b/system_test/mirror_maker_testsuite/testcase_15003/testcase_5003_properties.json
deleted file mode 100644
index 842c70e..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15003/testcase_5003_properties.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
-                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
-                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
-                  "04":"Produce and consume messages to a single topic - single partition.",
-                  "05":"This test sends messages to 3 replicas",
-                  "06":"At the end it verifies the log size and contents",
-                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
-                  "08":"Producer dimensions : mode:async, acks:-1, comp:1",
-                  "09":"Log segment size    : 20480"
-  },
-  "testcase_args": {
-    "bounce_leader": "false",
-    "bounce_mirror_maker": "true",
-    "bounced_entity_downtime_sec": "30",
-    "replica_factor": "3",
-    "num_partition": "1",
-    "num_iteration": "1",
-    "sleep_seconds_between_producer_calls": "1",
-    "message_producing_free_time_sec": "15",
-    "num_messages_to_produce_per_producer_call": "50"
-  },
-  "entities": [
-    {
-      "entity_id": "0",
-      "clientPort": "2108",
-      "dataDir": "/tmp/zookeeper_0",
-      "log_filename": "zookeeper_0.log",
-      "config_filename": "zookeeper_0.properties"
-    },
-    {
-      "entity_id": "1",
-      "clientPort": "2118",
-      "dataDir": "/tmp/zookeeper_1",
-      "log_filename": "zookeeper_1.log",
-      "config_filename": "zookeeper_1.properties"
-    },
-
-    {
-      "entity_id": "2",
-      "clientPort": "2128",
-      "dataDir": "/tmp/zookeeper_2",
-      "log_filename": "zookeeper_2.log",
-      "config_filename": "zookeeper_2.properties"
-    },
-    {
-      "entity_id": "3",
-      "clientPort": "2138",
-      "dataDir": "/tmp/zookeeper_3",
-      "log_filename": "zookeeper_3.log",
-      "config_filename": "zookeeper_3.properties"
-    },
-
-    {
-      "entity_id": "4",
-      "port": "9091",
-      "broker.id": "1",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_4_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_4.log",
-      "config_filename": "kafka_server_4.properties"
-    },
-    {
-      "entity_id": "5",
-      "port": "9092",
-      "broker.id": "2",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_5_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_5.log",
-      "config_filename": "kafka_server_5.properties"
-    },
-    {
-      "entity_id": "6",
-      "port": "9093",
-      "broker.id": "3",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_6_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_6.log",
-      "config_filename": "kafka_server_6.properties"
-    },
-    {
-      "entity_id": "7",
-      "port": "9094",
-      "broker.id": "4",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_7_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_7.log",
-      "config_filename": "kafka_server_7.properties"
-    },
-    {
-      "entity_id": "8",
-      "port": "9095",
-      "broker.id": "5",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_8_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_8.log",
-      "config_filename": "kafka_server_8.properties"
-    },
-    {
-      "entity_id": "9",
-      "port": "9096",
-      "broker.id": "6",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_9_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_9.log",
-      "config_filename": "kafka_server_9.properties"
-    },
-
-    {
-      "entity_id": "10",
-      "topic": "test_1",
-      "threads": "5",
-      "compression-codec": "2",
-      "message-size": "500",
-      "message": "100",
-      "request-num-acks": "-1",
-      "sync":"false",
-      "producer-num-retries":"5",
-      "log_filename": "producer_performance_10.log",
-      "config_filename": "producer_performance_10.properties"
-    },
-    {
-      "entity_id": "11",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_11.log",
-      "config_filename": "console_consumer_11.properties"
-    },
-
-    {
-      "entity_id": "12",
-      "log_filename": "mirror_maker_12.log",
-      "mirror_consumer_config_filename": "mirror_consumer_12.properties",
-      "mirror_producer_config_filename": "mirror_producer_12.properties"
-    },
-    {
-      "entity_id": "13",
-      "log_filename": "mirror_maker_13.log",
-      "mirror_consumer_config_filename": "mirror_consumer_13.properties",
-      "mirror_producer_config_filename": "mirror_producer_13.properties"
-    }
-   ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15004/testcase_15004_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15004/testcase_15004_properties.json b/system_test/mirror_maker_testsuite/testcase_15004/testcase_15004_properties.json
new file mode 100644
index 0000000..48864e6
--- /dev/null
+++ b/system_test/mirror_maker_testsuite/testcase_15004/testcase_15004_properties.json
@@ -0,0 +1,156 @@
+{
+  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
+                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
+                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
+                  "04":"Produce and consume messages to a single topic - single partition.",
+                  "05":"This test sends messages to 3 replicas",
+                  "06":"At the end it verifies the log size and contents",
+                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
+                  "08":"Producer dimensions : mode:async, acks:1, comp:1",
+                  "09":"Log segment size    : 20480"
+  },
+  "testcase_args": {
+    "bounce_leader": "false",
+    "bounce_mirror_maker": "true",
+    "bounced_entity_downtime_sec": "30",
+    "replica_factor": "3",
+    "num_partition": "1",
+    "num_iteration": "1",
+    "sleep_seconds_between_producer_calls": "1",
+    "message_producing_free_time_sec": "15",
+    "num_messages_to_produce_per_producer_call": "50"
+  },
+  "entities": [
+    {
+      "entity_id": "0",
+      "clientPort": "2108",
+      "dataDir": "/tmp/zookeeper_0",
+      "log_filename": "zookeeper_0.log",
+      "config_filename": "zookeeper_0.properties"
+    },
+    {
+      "entity_id": "1",
+      "clientPort": "2118",
+      "dataDir": "/tmp/zookeeper_1",
+      "log_filename": "zookeeper_1.log",
+      "config_filename": "zookeeper_1.properties"
+    },
+
+    {
+      "entity_id": "2",
+      "clientPort": "2128",
+      "dataDir": "/tmp/zookeeper_2",
+      "log_filename": "zookeeper_2.log",
+      "config_filename": "zookeeper_2.properties"
+    },
+    {
+      "entity_id": "3",
+      "clientPort": "2138",
+      "dataDir": "/tmp/zookeeper_3",
+      "log_filename": "zookeeper_3.log",
+      "config_filename": "zookeeper_3.properties"
+    },
+
+    {
+      "entity_id": "4",
+      "port": "9091",
+      "broker.id": "1",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_4_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_4.log",
+      "config_filename": "kafka_server_4.properties"
+    },
+    {
+      "entity_id": "5",
+      "port": "9092",
+      "broker.id": "2",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_5_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_5.log",
+      "config_filename": "kafka_server_5.properties"
+    },
+    {
+      "entity_id": "6",
+      "port": "9093",
+      "broker.id": "3",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_6_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_6.log",
+      "config_filename": "kafka_server_6.properties"
+    },
+    {
+      "entity_id": "7",
+      "port": "9094",
+      "broker.id": "4",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_7_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_7.log",
+      "config_filename": "kafka_server_7.properties"
+    },
+    {
+      "entity_id": "8",
+      "port": "9095",
+      "broker.id": "5",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_8_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_8.log",
+      "config_filename": "kafka_server_8.properties"
+    },
+    {
+      "entity_id": "9",
+      "port": "9096",
+      "broker.id": "6",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_9_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_9.log",
+      "config_filename": "kafka_server_9.properties"
+    },
+
+    {
+      "entity_id": "10",
+      "topic": "test_1",
+      "threads": "5",
+      "compression-codec": "1",
+      "message-size": "500",
+      "message": "100",
+      "request-num-acks": "1",
+      "sync":"false",
+      "producer-num-retries":"5",
+      "log_filename": "producer_performance_10.log",
+      "config_filename": "producer_performance_10.properties"
+    },
+    {
+      "entity_id": "11",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_11.log",
+      "config_filename": "console_consumer_11.properties"
+    },
+
+    {
+      "entity_id": "12",
+      "log_filename": "mirror_maker_12.log",
+      "mirror_consumer_config_filename": "mirror_consumer_12.properties",
+      "mirror_producer_config_filename": "mirror_producer_12.properties"
+    },
+    {
+      "entity_id": "13",
+      "log_filename": "mirror_maker_13.log",
+      "mirror_consumer_config_filename": "mirror_consumer_13.properties",
+      "mirror_producer_config_filename": "mirror_producer_13.properties"
+    }
+   ]
+}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15004/testcase_5004_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15004/testcase_5004_properties.json b/system_test/mirror_maker_testsuite/testcase_15004/testcase_5004_properties.json
deleted file mode 100644
index 48864e6..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15004/testcase_5004_properties.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
-                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
-                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
-                  "04":"Produce and consume messages to a single topic - single partition.",
-                  "05":"This test sends messages to 3 replicas",
-                  "06":"At the end it verifies the log size and contents",
-                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
-                  "08":"Producer dimensions : mode:async, acks:1, comp:1",
-                  "09":"Log segment size    : 20480"
-  },
-  "testcase_args": {
-    "bounce_leader": "false",
-    "bounce_mirror_maker": "true",
-    "bounced_entity_downtime_sec": "30",
-    "replica_factor": "3",
-    "num_partition": "1",
-    "num_iteration": "1",
-    "sleep_seconds_between_producer_calls": "1",
-    "message_producing_free_time_sec": "15",
-    "num_messages_to_produce_per_producer_call": "50"
-  },
-  "entities": [
-    {
-      "entity_id": "0",
-      "clientPort": "2108",
-      "dataDir": "/tmp/zookeeper_0",
-      "log_filename": "zookeeper_0.log",
-      "config_filename": "zookeeper_0.properties"
-    },
-    {
-      "entity_id": "1",
-      "clientPort": "2118",
-      "dataDir": "/tmp/zookeeper_1",
-      "log_filename": "zookeeper_1.log",
-      "config_filename": "zookeeper_1.properties"
-    },
-
-    {
-      "entity_id": "2",
-      "clientPort": "2128",
-      "dataDir": "/tmp/zookeeper_2",
-      "log_filename": "zookeeper_2.log",
-      "config_filename": "zookeeper_2.properties"
-    },
-    {
-      "entity_id": "3",
-      "clientPort": "2138",
-      "dataDir": "/tmp/zookeeper_3",
-      "log_filename": "zookeeper_3.log",
-      "config_filename": "zookeeper_3.properties"
-    },
-
-    {
-      "entity_id": "4",
-      "port": "9091",
-      "broker.id": "1",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_4_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_4.log",
-      "config_filename": "kafka_server_4.properties"
-    },
-    {
-      "entity_id": "5",
-      "port": "9092",
-      "broker.id": "2",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_5_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_5.log",
-      "config_filename": "kafka_server_5.properties"
-    },
-    {
-      "entity_id": "6",
-      "port": "9093",
-      "broker.id": "3",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_6_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_6.log",
-      "config_filename": "kafka_server_6.properties"
-    },
-    {
-      "entity_id": "7",
-      "port": "9094",
-      "broker.id": "4",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_7_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_7.log",
-      "config_filename": "kafka_server_7.properties"
-    },
-    {
-      "entity_id": "8",
-      "port": "9095",
-      "broker.id": "5",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_8_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_8.log",
-      "config_filename": "kafka_server_8.properties"
-    },
-    {
-      "entity_id": "9",
-      "port": "9096",
-      "broker.id": "6",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_9_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_9.log",
-      "config_filename": "kafka_server_9.properties"
-    },
-
-    {
-      "entity_id": "10",
-      "topic": "test_1",
-      "threads": "5",
-      "compression-codec": "1",
-      "message-size": "500",
-      "message": "100",
-      "request-num-acks": "1",
-      "sync":"false",
-      "producer-num-retries":"5",
-      "log_filename": "producer_performance_10.log",
-      "config_filename": "producer_performance_10.properties"
-    },
-    {
-      "entity_id": "11",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_11.log",
-      "config_filename": "console_consumer_11.properties"
-    },
-
-    {
-      "entity_id": "12",
-      "log_filename": "mirror_maker_12.log",
-      "mirror_consumer_config_filename": "mirror_consumer_12.properties",
-      "mirror_producer_config_filename": "mirror_producer_12.properties"
-    },
-    {
-      "entity_id": "13",
-      "log_filename": "mirror_maker_13.log",
-      "mirror_consumer_config_filename": "mirror_consumer_13.properties",
-      "mirror_producer_config_filename": "mirror_producer_13.properties"
-    }
-   ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15005/testcase_15005_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15005/testcase_15005_properties.json b/system_test/mirror_maker_testsuite/testcase_15005/testcase_15005_properties.json
new file mode 100644
index 0000000..92b2a6b
--- /dev/null
+++ b/system_test/mirror_maker_testsuite/testcase_15005/testcase_15005_properties.json
@@ -0,0 +1,178 @@
+{
+  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
+                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
+                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
+                  "04":"Produce and consume messages to 2 topics - 2 partitions.",
+                  "05":"This test sends messages to 3 replicas",
+                  "06":"At the end it verifies the log size and contents",
+                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
+                  "08":"Producer dimensions : mode:async, acks:-1, comp:1",
+                  "09":"Log segment size    : 20480"
+  },
+  "testcase_args": {
+    "bounce_leader": "false",
+    "bounce_mirror_maker": "true",
+    "bounced_entity_downtime_sec": "30",
+    "replica_factor": "3",
+    "num_partition": "2",
+    "num_iteration": "1",
+    "sleep_seconds_between_producer_calls": "1",
+    "message_producing_free_time_sec": "15",
+    "num_messages_to_produce_per_producer_call": "50"
+  },
+  "entities": [
+    {
+      "entity_id": "0",
+      "clientPort": "2108",
+      "dataDir": "/tmp/zookeeper_0",
+      "log_filename": "zookeeper_0.log",
+      "config_filename": "zookeeper_0.properties"
+    },
+    {
+      "entity_id": "1",
+      "clientPort": "2118",
+      "dataDir": "/tmp/zookeeper_1",
+      "log_filename": "zookeeper_1.log",
+      "config_filename": "zookeeper_1.properties"
+    },
+
+    {
+      "entity_id": "2",
+      "clientPort": "2128",
+      "dataDir": "/tmp/zookeeper_2",
+      "log_filename": "zookeeper_2.log",
+      "config_filename": "zookeeper_2.properties"
+    },
+    {
+      "entity_id": "3",
+      "clientPort": "2138",
+      "dataDir": "/tmp/zookeeper_3",
+      "log_filename": "zookeeper_3.log",
+      "config_filename": "zookeeper_3.properties"
+    },
+
+    {
+      "entity_id": "4",
+      "port": "9091",
+      "broker.id": "1",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_4_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_4.log",
+      "config_filename": "kafka_server_4.properties"
+    },
+    {
+      "entity_id": "5",
+      "port": "9092",
+      "broker.id": "2",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_5_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_5.log",
+      "config_filename": "kafka_server_5.properties"
+    },
+    {
+      "entity_id": "6",
+      "port": "9093",
+      "broker.id": "3",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_6_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_6.log",
+      "config_filename": "kafka_server_6.properties"
+    },
+    {
+      "entity_id": "7",
+      "port": "9094",
+      "broker.id": "4",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_7_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_7.log",
+      "config_filename": "kafka_server_7.properties"
+    },
+    {
+      "entity_id": "8",
+      "port": "9095",
+      "broker.id": "5",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_8_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_8.log",
+      "config_filename": "kafka_server_8.properties"
+    },
+    {
+      "entity_id": "9",
+      "port": "9096",
+      "broker.id": "6",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_9_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_9.log",
+      "config_filename": "kafka_server_9.properties"
+    },
+
+    {
+      "entity_id": "10",
+      "topic": "test_1",
+      "threads": "5",
+      "compression-codec": "1",
+      "message-size": "500",
+      "message": "100",
+      "request-num-acks": "-1",
+      "sync":"false",
+      "producer-num-retries":"5",
+      "log_filename": "producer_performance_10.log",
+      "config_filename": "producer_performance_10.properties"
+    },
+    {
+      "entity_id": "11",
+      "topic": "test_2",
+      "threads": "5",
+      "compression-codec": "1",
+      "message-size": "500",
+      "message": "100",
+      "request-num-acks": "-1",
+      "sync":"false",
+      "producer-num-retries":"5",
+      "log_filename": "producer_performance_11.log",
+      "config_filename": "producer_performance_11.properties"
+    },
+
+    {
+      "entity_id": "12",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_12.log",
+      "config_filename": "console_consumer_12.properties"
+    },
+    {
+      "entity_id": "13",
+      "topic": "test_2",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_13.log",
+      "config_filename": "console_consumer_13.properties"
+    },
+
+    {
+      "entity_id": "14",
+      "log_filename": "mirror_maker_14.log",
+      "mirror_consumer_config_filename": "mirror_consumer_14.properties",
+      "mirror_producer_config_filename": "mirror_producer_14.properties"
+    },
+    {
+      "entity_id": "15",
+      "log_filename": "mirror_maker_15.log",
+      "mirror_consumer_config_filename": "mirror_consumer_15.properties",
+      "mirror_producer_config_filename": "mirror_producer_15.properties"
+    }
+   ]
+}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15005/testcase_5005_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15005/testcase_5005_properties.json b/system_test/mirror_maker_testsuite/testcase_15005/testcase_5005_properties.json
deleted file mode 100644
index 92b2a6b..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15005/testcase_5005_properties.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
-                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
-                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
-                  "04":"Produce and consume messages to 2 topics - 2 partitions.",
-                  "05":"This test sends messages to 3 replicas",
-                  "06":"At the end it verifies the log size and contents",
-                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
-                  "08":"Producer dimensions : mode:async, acks:-1, comp:1",
-                  "09":"Log segment size    : 20480"
-  },
-  "testcase_args": {
-    "bounce_leader": "false",
-    "bounce_mirror_maker": "true",
-    "bounced_entity_downtime_sec": "30",
-    "replica_factor": "3",
-    "num_partition": "2",
-    "num_iteration": "1",
-    "sleep_seconds_between_producer_calls": "1",
-    "message_producing_free_time_sec": "15",
-    "num_messages_to_produce_per_producer_call": "50"
-  },
-  "entities": [
-    {
-      "entity_id": "0",
-      "clientPort": "2108",
-      "dataDir": "/tmp/zookeeper_0",
-      "log_filename": "zookeeper_0.log",
-      "config_filename": "zookeeper_0.properties"
-    },
-    {
-      "entity_id": "1",
-      "clientPort": "2118",
-      "dataDir": "/tmp/zookeeper_1",
-      "log_filename": "zookeeper_1.log",
-      "config_filename": "zookeeper_1.properties"
-    },
-
-    {
-      "entity_id": "2",
-      "clientPort": "2128",
-      "dataDir": "/tmp/zookeeper_2",
-      "log_filename": "zookeeper_2.log",
-      "config_filename": "zookeeper_2.properties"
-    },
-    {
-      "entity_id": "3",
-      "clientPort": "2138",
-      "dataDir": "/tmp/zookeeper_3",
-      "log_filename": "zookeeper_3.log",
-      "config_filename": "zookeeper_3.properties"
-    },
-
-    {
-      "entity_id": "4",
-      "port": "9091",
-      "broker.id": "1",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_4_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_4.log",
-      "config_filename": "kafka_server_4.properties"
-    },
-    {
-      "entity_id": "5",
-      "port": "9092",
-      "broker.id": "2",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_5_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_5.log",
-      "config_filename": "kafka_server_5.properties"
-    },
-    {
-      "entity_id": "6",
-      "port": "9093",
-      "broker.id": "3",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_6_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_6.log",
-      "config_filename": "kafka_server_6.properties"
-    },
-    {
-      "entity_id": "7",
-      "port": "9094",
-      "broker.id": "4",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_7_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_7.log",
-      "config_filename": "kafka_server_7.properties"
-    },
-    {
-      "entity_id": "8",
-      "port": "9095",
-      "broker.id": "5",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_8_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_8.log",
-      "config_filename": "kafka_server_8.properties"
-    },
-    {
-      "entity_id": "9",
-      "port": "9096",
-      "broker.id": "6",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_9_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_9.log",
-      "config_filename": "kafka_server_9.properties"
-    },
-
-    {
-      "entity_id": "10",
-      "topic": "test_1",
-      "threads": "5",
-      "compression-codec": "1",
-      "message-size": "500",
-      "message": "100",
-      "request-num-acks": "-1",
-      "sync":"false",
-      "producer-num-retries":"5",
-      "log_filename": "producer_performance_10.log",
-      "config_filename": "producer_performance_10.properties"
-    },
-    {
-      "entity_id": "11",
-      "topic": "test_2",
-      "threads": "5",
-      "compression-codec": "1",
-      "message-size": "500",
-      "message": "100",
-      "request-num-acks": "-1",
-      "sync":"false",
-      "producer-num-retries":"5",
-      "log_filename": "producer_performance_11.log",
-      "config_filename": "producer_performance_11.properties"
-    },
-
-    {
-      "entity_id": "12",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_12.log",
-      "config_filename": "console_consumer_12.properties"
-    },
-    {
-      "entity_id": "13",
-      "topic": "test_2",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_13.log",
-      "config_filename": "console_consumer_13.properties"
-    },
-
-    {
-      "entity_id": "14",
-      "log_filename": "mirror_maker_14.log",
-      "mirror_consumer_config_filename": "mirror_consumer_14.properties",
-      "mirror_producer_config_filename": "mirror_producer_14.properties"
-    },
-    {
-      "entity_id": "15",
-      "log_filename": "mirror_maker_15.log",
-      "mirror_consumer_config_filename": "mirror_consumer_15.properties",
-      "mirror_producer_config_filename": "mirror_producer_15.properties"
-    }
-   ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15006/testcase_15006_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15006/testcase_15006_properties.json b/system_test/mirror_maker_testsuite/testcase_15006/testcase_15006_properties.json
new file mode 100644
index 0000000..7d5019c
--- /dev/null
+++ b/system_test/mirror_maker_testsuite/testcase_15006/testcase_15006_properties.json
@@ -0,0 +1,178 @@
+{
+  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
+                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
+                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
+                  "04":"Produce and consume messages to 2 topics - 2 partitions.",
+                  "05":"This test sends messages to 3 replicas",
+                  "06":"At the end it verifies the log size and contents",
+                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
+                  "08":"Producer dimensions : mode:async, acks:1, comp:1",
+                  "09":"Log segment size    : 20480"
+  },
+  "testcase_args": {
+    "bounce_leader": "false",
+    "bounce_mirror_maker": "true",
+    "bounced_entity_downtime_sec": "30",
+    "replica_factor": "3",
+    "num_partition": "2",
+    "num_iteration": "1",
+    "sleep_seconds_between_producer_calls": "1",
+    "message_producing_free_time_sec": "15",
+    "num_messages_to_produce_per_producer_call": "50"
+  },
+  "entities": [
+    {
+      "entity_id": "0",
+      "clientPort": "2108",
+      "dataDir": "/tmp/zookeeper_0",
+      "log_filename": "zookeeper_0.log",
+      "config_filename": "zookeeper_0.properties"
+    },
+    {
+      "entity_id": "1",
+      "clientPort": "2118",
+      "dataDir": "/tmp/zookeeper_1",
+      "log_filename": "zookeeper_1.log",
+      "config_filename": "zookeeper_1.properties"
+    },
+
+    {
+      "entity_id": "2",
+      "clientPort": "2128",
+      "dataDir": "/tmp/zookeeper_2",
+      "log_filename": "zookeeper_2.log",
+      "config_filename": "zookeeper_2.properties"
+    },
+    {
+      "entity_id": "3",
+      "clientPort": "2138",
+      "dataDir": "/tmp/zookeeper_3",
+      "log_filename": "zookeeper_3.log",
+      "config_filename": "zookeeper_3.properties"
+    },
+
+    {
+      "entity_id": "4",
+      "port": "9091",
+      "broker.id": "1",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_4_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_4.log",
+      "config_filename": "kafka_server_4.properties"
+    },
+    {
+      "entity_id": "5",
+      "port": "9092",
+      "broker.id": "2",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_5_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_5.log",
+      "config_filename": "kafka_server_5.properties"
+    },
+    {
+      "entity_id": "6",
+      "port": "9093",
+      "broker.id": "3",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_6_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_6.log",
+      "config_filename": "kafka_server_6.properties"
+    },
+    {
+      "entity_id": "7",
+      "port": "9094",
+      "broker.id": "4",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_7_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_7.log",
+      "config_filename": "kafka_server_7.properties"
+    },
+    {
+      "entity_id": "8",
+      "port": "9095",
+      "broker.id": "5",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_8_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_8.log",
+      "config_filename": "kafka_server_8.properties"
+    },
+    {
+      "entity_id": "9",
+      "port": "9096",
+      "broker.id": "6",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_9_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "5",
+      "log_filename": "kafka_server_9.log",
+      "config_filename": "kafka_server_9.properties"
+    },
+
+    {
+      "entity_id": "10",
+      "topic": "test_1",
+      "threads": "5",
+      "compression-codec": "1",
+      "message-size": "500",
+      "message": "100",
+      "request-num-acks": "1",
+      "sync":"false",
+      "producer-num-retries":"5",
+      "log_filename": "producer_performance_10.log",
+      "config_filename": "producer_performance_10.properties"
+    },
+    {
+      "entity_id": "11",
+      "topic": "test_2",
+      "threads": "5",
+      "compression-codec": "1",
+      "message-size": "500",
+      "message": "100",
+      "request-num-acks": "1",
+      "sync":"false",
+      "producer-num-retries":"5",
+      "log_filename": "producer_performance_11.log",
+      "config_filename": "producer_performance_11.properties"
+    },
+
+    {
+      "entity_id": "12",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_12.log",
+      "config_filename": "console_consumer_12.properties"
+    },
+    {
+      "entity_id": "13",
+      "topic": "test_2",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "log_filename": "console_consumer_13.log",
+      "config_filename": "console_consumer_13.properties"
+    },
+
+    {
+      "entity_id": "14",
+      "log_filename": "mirror_maker_14.log",
+      "mirror_consumer_config_filename": "mirror_consumer_14.properties",
+      "mirror_producer_config_filename": "mirror_producer_14.properties"
+    },
+    {
+      "entity_id": "15",
+      "log_filename": "mirror_maker_15.log",
+      "mirror_consumer_config_filename": "mirror_consumer_15.properties",
+      "mirror_producer_config_filename": "mirror_producer_15.properties"
+    }
+   ]
+}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/mirror_maker_testsuite/testcase_15006/testcase_5006_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15006/testcase_5006_properties.json b/system_test/mirror_maker_testsuite/testcase_15006/testcase_5006_properties.json
deleted file mode 100644
index 7d5019c..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15006/testcase_5006_properties.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-  "description": {"01":"Replication with Mirror Maker => Bounce Mirror Maker",
-                  "02":"Set up 2 clusters such as : SOURCE => MirrorMaker => TARGET",
-                  "03":"Set up 2-node Zk cluster for both SOURCE & TARGET",
-                  "04":"Produce and consume messages to 2 topics - 2 partitions.",
-                  "05":"This test sends messages to 3 replicas",
-                  "06":"At the end it verifies the log size and contents",
-                  "07":"Use a consumer to verify no message loss in TARGET cluster.",
-                  "08":"Producer dimensions : mode:async, acks:1, comp:1",
-                  "09":"Log segment size    : 20480"
-  },
-  "testcase_args": {
-    "bounce_leader": "false",
-    "bounce_mirror_maker": "true",
-    "bounced_entity_downtime_sec": "30",
-    "replica_factor": "3",
-    "num_partition": "2",
-    "num_iteration": "1",
-    "sleep_seconds_between_producer_calls": "1",
-    "message_producing_free_time_sec": "15",
-    "num_messages_to_produce_per_producer_call": "50"
-  },
-  "entities": [
-    {
-      "entity_id": "0",
-      "clientPort": "2108",
-      "dataDir": "/tmp/zookeeper_0",
-      "log_filename": "zookeeper_0.log",
-      "config_filename": "zookeeper_0.properties"
-    },
-    {
-      "entity_id": "1",
-      "clientPort": "2118",
-      "dataDir": "/tmp/zookeeper_1",
-      "log_filename": "zookeeper_1.log",
-      "config_filename": "zookeeper_1.properties"
-    },
-
-    {
-      "entity_id": "2",
-      "clientPort": "2128",
-      "dataDir": "/tmp/zookeeper_2",
-      "log_filename": "zookeeper_2.log",
-      "config_filename": "zookeeper_2.properties"
-    },
-    {
-      "entity_id": "3",
-      "clientPort": "2138",
-      "dataDir": "/tmp/zookeeper_3",
-      "log_filename": "zookeeper_3.log",
-      "config_filename": "zookeeper_3.properties"
-    },
-
-    {
-      "entity_id": "4",
-      "port": "9091",
-      "broker.id": "1",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_4_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_4.log",
-      "config_filename": "kafka_server_4.properties"
-    },
-    {
-      "entity_id": "5",
-      "port": "9092",
-      "broker.id": "2",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_5_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_5.log",
-      "config_filename": "kafka_server_5.properties"
-    },
-    {
-      "entity_id": "6",
-      "port": "9093",
-      "broker.id": "3",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_6_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_6.log",
-      "config_filename": "kafka_server_6.properties"
-    },
-    {
-      "entity_id": "7",
-      "port": "9094",
-      "broker.id": "4",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_7_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_7.log",
-      "config_filename": "kafka_server_7.properties"
-    },
-    {
-      "entity_id": "8",
-      "port": "9095",
-      "broker.id": "5",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_8_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_8.log",
-      "config_filename": "kafka_server_8.properties"
-    },
-    {
-      "entity_id": "9",
-      "port": "9096",
-      "broker.id": "6",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_9_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "5",
-      "log_filename": "kafka_server_9.log",
-      "config_filename": "kafka_server_9.properties"
-    },
-
-    {
-      "entity_id": "10",
-      "topic": "test_1",
-      "threads": "5",
-      "compression-codec": "1",
-      "message-size": "500",
-      "message": "100",
-      "request-num-acks": "1",
-      "sync":"false",
-      "producer-num-retries":"5",
-      "log_filename": "producer_performance_10.log",
-      "config_filename": "producer_performance_10.properties"
-    },
-    {
-      "entity_id": "11",
-      "topic": "test_2",
-      "threads": "5",
-      "compression-codec": "1",
-      "message-size": "500",
-      "message": "100",
-      "request-num-acks": "1",
-      "sync":"false",
-      "producer-num-retries":"5",
-      "log_filename": "producer_performance_11.log",
-      "config_filename": "producer_performance_11.properties"
-    },
-
-    {
-      "entity_id": "12",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_12.log",
-      "config_filename": "console_consumer_12.properties"
-    },
-    {
-      "entity_id": "13",
-      "topic": "test_2",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "log_filename": "console_consumer_13.log",
-      "config_filename": "console_consumer_13.properties"
-    },
-
-    {
-      "entity_id": "14",
-      "log_filename": "mirror_maker_14.log",
-      "mirror_consumer_config_filename": "mirror_consumer_14.properties",
-      "mirror_producer_config_filename": "mirror_producer_14.properties"
-    },
-    {
-      "entity_id": "15",
-      "log_filename": "mirror_maker_15.log",
-      "mirror_consumer_config_filename": "mirror_consumer_15.properties",
-      "mirror_producer_config_filename": "mirror_producer_15.properties"
-    }
-   ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json b/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
index 308f193..250ffe0 100644
--- a/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
+++ b/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
@@ -5,7 +5,7 @@
                   "04":"At the end it verifies the log size and contents",
                   "05":"Use a consumer to verify no message loss.",
                   "06":"Producer dimensions : mode:sync, acks:-1, comp:0",
-                  "07":"Log segment size    : 20480
+                  "07":"Log segment size    : 20480"
   },
   "testcase_args": {
     "broker_type": "leader",

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/replication_testsuite/testcase_10101/testcase_0101_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_10101/testcase_0101_properties.json b/system_test/replication_testsuite/testcase_10101/testcase_0101_properties.json
deleted file mode 100644
index 3f8e587..0000000
--- a/system_test/replication_testsuite/testcase_10101/testcase_0101_properties.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "description": {"01":"Leader Failure in Replication : Base Test",
-                  "02":"Produce and consume messages to a single topic - single partition.",
-                  "03":"This test sends messages to 3 replicas",
-                  "04":"To trigger leader election: find the leader and terminate by controlled failure (kill -15)",
-                  "05":"Restart the terminated broker",
-                  "06":"Lookup brokers' log4j messages and verify that leader is re-elected successfully",
-                  "07":"At the end it verifies the log size and contents",
-                  "08":"Use a consumer to verify no message loss.",
-                  "09":"Producer dimensions : mode:sync, acks:-1, comp:0",
-                  "10":"Log segment size    : 20480"
-  },
-  "testcase_args": {
-    "broker_type": "leader",
-    "bounce_broker": "true",
-    "replica_factor": "3",
-    "num_partition": "1",
-    "num_iteration": "1",
-    "sleep_seconds_between_producer_calls": "1",
-    "message_producing_free_time_sec": "15",
-    "num_messages_to_produce_per_producer_call": "50"
-  },
-  "entities": [
-    {
-      "entity_id": "0",
-      "clientPort": "2188",
-      "dataDir": "/tmp/zookeeper_0",
-      "log_filename": "zookeeper_2188.log",
-      "config_filename": "zookeeper_2188.properties"
-    },
-    {
-      "entity_id": "1",
-      "port": "9091",
-      "broker.id": "1",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_1_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "1",
-      "log_filename": "kafka_server_9091.log",
-      "config_filename": "kafka_server_9091.properties"
-    },
-    {
-      "entity_id": "2",
-      "port": "9092",
-      "broker.id": "2",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_2_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "1",
-      "log_filename": "kafka_server_9092.log",
-      "config_filename": "kafka_server_9092.properties"
-    },
-    {
-      "entity_id": "3",
-      "port": "9093",
-      "broker.id": "3",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_3_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "1",
-      "log_filename": "kafka_server_9093.log",
-      "config_filename": "kafka_server_9093.properties"
-    },
-    {
-      "entity_id": "4",
-      "topic": "test_1",
-      "threads": "5",
-      "compression-codec": "0",
-      "message-size": "500",
-      "message": "100",
-      "request-num-acks": "-1",
-      "sync":"true",
-      "log_filename": "producer_performance.log",
-      "config_filename": "producer_performance.properties"
-    },
-    {
-      "entity_id": "5",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "zookeeper": "localhost:2188",
-      "log_filename": "console_consumer.log",
-      "config_filename": "console_consumer.properties"
-    }
-  ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/replication_testsuite/testcase_10101/testcase_10101_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_10101/testcase_10101_properties.json b/system_test/replication_testsuite/testcase_10101/testcase_10101_properties.json
new file mode 100644
index 0000000..3f8e587
--- /dev/null
+++ b/system_test/replication_testsuite/testcase_10101/testcase_10101_properties.json
@@ -0,0 +1,86 @@
+{
+  "description": {"01":"Leader Failure in Replication : Base Test",
+                  "02":"Produce and consume messages to a single topic - single partition.",
+                  "03":"This test sends messages to 3 replicas",
+                  "04":"To trigger leader election: find the leader and terminate by controlled failure (kill -15)",
+                  "05":"Restart the terminated broker",
+                  "06":"Lookup brokers' log4j messages and verify that leader is re-elected successfully",
+                  "07":"At the end it verifies the log size and contents",
+                  "08":"Use a consumer to verify no message loss.",
+                  "09":"Producer dimensions : mode:sync, acks:-1, comp:0",
+                  "10":"Log segment size    : 20480"
+  },
+  "testcase_args": {
+    "broker_type": "leader",
+    "bounce_broker": "true",
+    "replica_factor": "3",
+    "num_partition": "1",
+    "num_iteration": "1",
+    "sleep_seconds_between_producer_calls": "1",
+    "message_producing_free_time_sec": "15",
+    "num_messages_to_produce_per_producer_call": "50"
+  },
+  "entities": [
+    {
+      "entity_id": "0",
+      "clientPort": "2188",
+      "dataDir": "/tmp/zookeeper_0",
+      "log_filename": "zookeeper_2188.log",
+      "config_filename": "zookeeper_2188.properties"
+    },
+    {
+      "entity_id": "1",
+      "port": "9091",
+      "broker.id": "1",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_1_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "1",
+      "log_filename": "kafka_server_9091.log",
+      "config_filename": "kafka_server_9091.properties"
+    },
+    {
+      "entity_id": "2",
+      "port": "9092",
+      "broker.id": "2",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_2_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "1",
+      "log_filename": "kafka_server_9092.log",
+      "config_filename": "kafka_server_9092.properties"
+    },
+    {
+      "entity_id": "3",
+      "port": "9093",
+      "broker.id": "3",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_3_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "1",
+      "log_filename": "kafka_server_9093.log",
+      "config_filename": "kafka_server_9093.properties"
+    },
+    {
+      "entity_id": "4",
+      "topic": "test_1",
+      "threads": "5",
+      "compression-codec": "0",
+      "message-size": "500",
+      "message": "100",
+      "request-num-acks": "-1",
+      "sync":"true",
+      "log_filename": "producer_performance.log",
+      "config_filename": "producer_performance.properties"
+    },
+    {
+      "entity_id": "5",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "zookeeper": "localhost:2188",
+      "log_filename": "console_consumer.log",
+      "config_filename": "console_consumer.properties"
+    }
+  ]
+}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/replication_testsuite/testcase_10102/testcase_0102_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_10102/testcase_0102_properties.json b/system_test/replication_testsuite/testcase_10102/testcase_0102_properties.json
deleted file mode 100644
index c96352d..0000000
--- a/system_test/replication_testsuite/testcase_10102/testcase_0102_properties.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "description": {"01":"Leader Failure in Replication : 1. comp => 1",
-                  "02":"Produce and consume messages to a single topic - single partition.",
-                  "03":"This test sends messages to 3 replicas",
-                  "04":"To trigger leader election: find the leader and terminate by controlled failure (kill -15)",
-                  "05":"Restart the terminated broker",
-                  "06":"Lookup brokers' log4j messages and verify that leader is re-elected successfully",
-                  "07":"At the end it verifies the log size and contents",
-                  "08":"Use a consumer to verify no message loss.",
-                  "09":"Producer dimensions : mode:sync, acks:-1, comp:1",
-                  "10":"Log segment size    : 20480"
-  },
-  "testcase_args": {
-    "broker_type": "leader",
-    "bounce_broker": "true",
-    "replica_factor": "3",
-    "num_partition": "1",
-    "num_iteration": "1",
-    "sleep_seconds_between_producer_calls": "1",
-    "message_producing_free_time_sec": "15",
-    "num_messages_to_produce_per_producer_call": "50"
-  },
-  "entities": [
-    {
-      "entity_id": "0",
-      "clientPort": "2188",
-      "dataDir": "/tmp/zookeeper_0",
-      "log_filename": "zookeeper_2188.log",
-      "config_filename": "zookeeper_2188.properties"
-    },
-    {
-      "entity_id": "1",
-      "port": "9091",
-      "broker.id": "1",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_1_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "1",
-      "log_filename": "kafka_server_9091.log",
-      "config_filename": "kafka_server_9091.properties"
-    },
-    {
-      "entity_id": "2",
-      "port": "9092",
-      "broker.id": "2",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_2_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "1",
-      "log_filename": "kafka_server_9092.log",
-      "config_filename": "kafka_server_9092.properties"
-    },
-    {
-      "entity_id": "3",
-      "port": "9093",
-      "broker.id": "3",
-      "log.segment.bytes": "20480",
-      "log.dir": "/tmp/kafka_server_3_logs",
-      "default.replication.factor": "3",
-      "num.partitions": "1",
-      "log_filename": "kafka_server_9093.log",
-      "config_filename": "kafka_server_9093.properties"
-    },
-    {
-      "entity_id": "4",
-      "topic": "test_1",
-      "threads": "5",
-      "compression-codec": "1",
-      "message-size": "500",
-      "message": "100",
-      "request-num-acks": "-1",
-      "sync":"true",
-      "log_filename": "producer_performance.log",
-      "config_filename": "producer_performance.properties"
-    },
-    {
-      "entity_id": "5",
-      "topic": "test_1",
-      "group.id": "mytestgroup",
-      "consumer-timeout-ms": "10000",
-      "zookeeper": "localhost:2188",
-      "log_filename": "console_consumer.log",
-      "config_filename": "console_consumer.properties"
-    }
-  ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/12ce4b1e/system_test/replication_testsuite/testcase_10102/testcase_10102_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_10102/testcase_10102_properties.json b/system_test/replication_testsuite/testcase_10102/testcase_10102_properties.json
new file mode 100644
index 0000000..c96352d
--- /dev/null
+++ b/system_test/replication_testsuite/testcase_10102/testcase_10102_properties.json
@@ -0,0 +1,86 @@
+{
+  "description": {"01":"Leader Failure in Replication : 1. comp => 1",
+                  "02":"Produce and consume messages to a single topic - single partition.",
+                  "03":"This test sends messages to 3 replicas",
+                  "04":"To trigger leader election: find the leader and terminate by controlled failure (kill -15)",
+                  "05":"Restart the terminated broker",
+                  "06":"Lookup brokers' log4j messages and verify that leader is re-elected successfully",
+                  "07":"At the end it verifies the log size and contents",
+                  "08":"Use a consumer to verify no message loss.",
+                  "09":"Producer dimensions : mode:sync, acks:-1, comp:1",
+                  "10":"Log segment size    : 20480"
+  },
+  "testcase_args": {
+    "broker_type": "leader",
+    "bounce_broker": "true",
+    "replica_factor": "3",
+    "num_partition": "1",
+    "num_iteration": "1",
+    "sleep_seconds_between_producer_calls": "1",
+    "message_producing_free_time_sec": "15",
+    "num_messages_to_produce_per_producer_call": "50"
+  },
+  "entities": [
+    {
+      "entity_id": "0",
+      "clientPort": "2188",
+      "dataDir": "/tmp/zookeeper_0",
+      "log_filename": "zookeeper_2188.log",
+      "config_filename": "zookeeper_2188.properties"
+    },
+    {
+      "entity_id": "1",
+      "port": "9091",
+      "broker.id": "1",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_1_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "1",
+      "log_filename": "kafka_server_9091.log",
+      "config_filename": "kafka_server_9091.properties"
+    },
+    {
+      "entity_id": "2",
+      "port": "9092",
+      "broker.id": "2",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_2_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "1",
+      "log_filename": "kafka_server_9092.log",
+      "config_filename": "kafka_server_9092.properties"
+    },
+    {
+      "entity_id": "3",
+      "port": "9093",
+      "broker.id": "3",
+      "log.segment.bytes": "20480",
+      "log.dir": "/tmp/kafka_server_3_logs",
+      "default.replication.factor": "3",
+      "num.partitions": "1",
+      "log_filename": "kafka_server_9093.log",
+      "config_filename": "kafka_server_9093.properties"
+    },
+    {
+      "entity_id": "4",
+      "topic": "test_1",
+      "threads": "5",
+      "compression-codec": "1",
+      "message-size": "500",
+      "message": "100",
+      "request-num-acks": "-1",
+      "sync":"true",
+      "log_filename": "producer_performance.log",
+      "config_filename": "producer_performance.properties"
+    },
+    {
+      "entity_id": "5",
+      "topic": "test_1",
+      "group.id": "mytestgroup",
+      "consumer-timeout-ms": "10000",
+      "zookeeper": "localhost:2188",
+      "log_filename": "console_consumer.log",
+      "config_filename": "console_consumer.properties"
+    }
+  ]
+}


Mime
View raw message