You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by gw...@apache.org on 2015/10/30 23:13:40 UTC

[11/13] kafka git commit: KAFKA-2715: Removed previous system_test folder

http://git-wip-us.apache.org/repos/asf/kafka/blob/d50499a0/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
deleted file mode 100644
index 48864e6..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15004/testcase_15004_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/d50499a0/system_test/mirror_maker_testsuite/testcase_15005/cluster_config.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15005/cluster_config.json b/system_test/mirror_maker_testsuite/testcase_15005/cluster_config.json
deleted file mode 100644
index 63ba37b..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15005/cluster_config.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-    "cluster_config": [
-        {
-            "entity_id": "0",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9100"
-        },
-        {
-            "entity_id": "1",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9101"
-        },
-
-        {
-            "entity_id": "2",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9102"
-        },
-        {
-            "entity_id": "3",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9103"
-        },
-
-        {
-            "entity_id": "4",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9104"
-        },
-        {
-            "entity_id": "5",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9105"
-        },
-        {
-            "entity_id": "6",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9106"
-        },
-
-        {
-            "entity_id": "7",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9107"
-        },
-        {
-            "entity_id": "8",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9108"
-        },
-        {
-            "entity_id": "9",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9109"
-        },
-
-        {
-            "entity_id": "10",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9110"
-        },
-        {
-            "entity_id": "11",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9111"
-        },
-        {
-            "entity_id": "12",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9112"
-        },
-        {
-            "entity_id": "13",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9113"
-        },
-
-        {
-            "entity_id": "14",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9114"
-        },
-        {
-            "entity_id": "15",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9115"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/d50499a0/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
deleted file mode 100644
index 92b2a6b..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15005/testcase_15005_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/d50499a0/system_test/mirror_maker_testsuite/testcase_15006/cluster_config.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_15006/cluster_config.json b/system_test/mirror_maker_testsuite/testcase_15006/cluster_config.json
deleted file mode 100644
index 63ba37b..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15006/cluster_config.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-    "cluster_config": [
-        {
-            "entity_id": "0",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9100"
-        },
-        {
-            "entity_id": "1",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9101"
-        },
-
-        {
-            "entity_id": "2",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9102"
-        },
-        {
-            "entity_id": "3",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9103"
-        },
-
-        {
-            "entity_id": "4",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9104"
-        },
-        {
-            "entity_id": "5",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9105"
-        },
-        {
-            "entity_id": "6",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9106"
-        },
-
-        {
-            "entity_id": "7",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9107"
-        },
-        {
-            "entity_id": "8",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9108"
-        },
-        {
-            "entity_id": "9",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9109"
-        },
-
-        {
-            "entity_id": "10",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9110"
-        },
-        {
-            "entity_id": "11",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9111"
-        },
-        {
-            "entity_id": "12",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9112"
-        },
-        {
-            "entity_id": "13",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9113"
-        },
-
-        {
-            "entity_id": "14",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9114"
-        },
-        {
-            "entity_id": "15",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9115"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/d50499a0/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
deleted file mode 100644
index 7d5019c..0000000
--- a/system_test/mirror_maker_testsuite/testcase_15006/testcase_15006_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/d50499a0/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json b/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json
deleted file mode 100644
index 0891836..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json
+++ /dev/null
@@ -1,160 +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    : 20480"
-  },
-  "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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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/d50499a0/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json b/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json
deleted file mode 100644
index 56e4812..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json
+++ /dev/null
@@ -1,160 +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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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/d50499a0/system_test/mirror_maker_testsuite/testcase_5003/cluster_config.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5003/cluster_config.json b/system_test/mirror_maker_testsuite/testcase_5003/cluster_config.json
deleted file mode 100644
index f6fe867..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5003/cluster_config.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "cluster_config": [
-        {
-            "entity_id": "0",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9100"
-        },
-        {
-            "entity_id": "1",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9101"
-        },
-
-        {
-            "entity_id": "2",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9102"
-        },
-        {
-            "entity_id": "3",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9103"
-        },
-
-        {
-            "entity_id": "4",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9104"
-        },
-        {
-            "entity_id": "5",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9105"
-        },
-        {
-            "entity_id": "6",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9106"
-        },
-
-        {
-            "entity_id": "7",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9107"
-        },
-        {
-            "entity_id": "8",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9108"
-        },
-        {
-            "entity_id": "9",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9109"
-        },
-
-        {
-            "entity_id": "10",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9110"
-        },
-        {
-            "entity_id": "11",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9111"
-        },
-
-        {
-            "entity_id": "12",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9112"
-        },
-        {
-            "entity_id": "13",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9113"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/d50499a0/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json b/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json
deleted file mode 100644
index 8f8c47a..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json
+++ /dev/null
@@ -1,159 +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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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/d50499a0/system_test/mirror_maker_testsuite/testcase_5004/cluster_config.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5004/cluster_config.json b/system_test/mirror_maker_testsuite/testcase_5004/cluster_config.json
deleted file mode 100644
index f6fe867..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5004/cluster_config.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "cluster_config": [
-        {
-            "entity_id": "0",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9100"
-        },
-        {
-            "entity_id": "1",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9101"
-        },
-
-        {
-            "entity_id": "2",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9102"
-        },
-        {
-            "entity_id": "3",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9103"
-        },
-
-        {
-            "entity_id": "4",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9104"
-        },
-        {
-            "entity_id": "5",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9105"
-        },
-        {
-            "entity_id": "6",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9106"
-        },
-
-        {
-            "entity_id": "7",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9107"
-        },
-        {
-            "entity_id": "8",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9108"
-        },
-        {
-            "entity_id": "9",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9109"
-        },
-
-        {
-            "entity_id": "10",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9110"
-        },
-        {
-            "entity_id": "11",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9111"
-        },
-
-        {
-            "entity_id": "12",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9112"
-        },
-        {
-            "entity_id": "13",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9113"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/d50499a0/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json b/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json
deleted file mode 100644
index baa639b..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json
+++ /dev/null
@@ -1,159 +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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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/d50499a0/system_test/mirror_maker_testsuite/testcase_5005/cluster_config.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5005/cluster_config.json b/system_test/mirror_maker_testsuite/testcase_5005/cluster_config.json
deleted file mode 100644
index 63ba37b..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5005/cluster_config.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-    "cluster_config": [
-        {
-            "entity_id": "0",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9100"
-        },
-        {
-            "entity_id": "1",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9101"
-        },
-
-        {
-            "entity_id": "2",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9102"
-        },
-        {
-            "entity_id": "3",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9103"
-        },
-
-        {
-            "entity_id": "4",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9104"
-        },
-        {
-            "entity_id": "5",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9105"
-        },
-        {
-            "entity_id": "6",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9106"
-        },
-
-        {
-            "entity_id": "7",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9107"
-        },
-        {
-            "entity_id": "8",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9108"
-        },
-        {
-            "entity_id": "9",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9109"
-        },
-
-        {
-            "entity_id": "10",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9110"
-        },
-        {
-            "entity_id": "11",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9111"
-        },
-        {
-            "entity_id": "12",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9112"
-        },
-        {
-            "entity_id": "13",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9113"
-        },
-
-        {
-            "entity_id": "14",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9114"
-        },
-        {
-            "entity_id": "15",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9115"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/d50499a0/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json b/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json
deleted file mode 100644
index 8c38375..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json
+++ /dev/null
@@ -1,182 +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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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/d50499a0/system_test/mirror_maker_testsuite/testcase_5006/cluster_config.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5006/cluster_config.json b/system_test/mirror_maker_testsuite/testcase_5006/cluster_config.json
deleted file mode 100644
index 63ba37b..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5006/cluster_config.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-    "cluster_config": [
-        {
-            "entity_id": "0",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9100"
-        },
-        {
-            "entity_id": "1",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9101"
-        },
-
-        {
-            "entity_id": "2",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9102"
-        },
-        {
-            "entity_id": "3",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9103"
-        },
-
-        {
-            "entity_id": "4",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9104"
-        },
-        {
-            "entity_id": "5",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9105"
-        },
-        {
-            "entity_id": "6",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9106"
-        },
-
-        {
-            "entity_id": "7",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9107"
-        },
-        {
-            "entity_id": "8",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9108"
-        },
-        {
-            "entity_id": "9",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9109"
-        },
-
-        {
-            "entity_id": "10",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9110"
-        },
-        {
-            "entity_id": "11",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9111"
-        },
-        {
-            "entity_id": "12",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9112"
-        },
-        {
-            "entity_id": "13",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9113"
-        },
-
-        {
-            "entity_id": "14",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9114"
-        },
-        {
-            "entity_id": "15",
-            "hostname": "localhost",
-            "role": "mirror_maker",
-            "cluster_name":"target",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9115"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/d50499a0/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json b/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json
deleted file mode 100644
index fb27533..0000000
--- a/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json
+++ /dev/null
@@ -1,182 +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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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",
-      "new-producer":"true",
-      "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/d50499a0/system_test/offset_management_testsuite/cluster_config.json
----------------------------------------------------------------------
diff --git a/system_test/offset_management_testsuite/cluster_config.json b/system_test/offset_management_testsuite/cluster_config.json
deleted file mode 100644
index dcca200..0000000
--- a/system_test/offset_management_testsuite/cluster_config.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "cluster_config": [
-        {
-            "entity_id": "0",
-            "hostname": "localhost",
-            "role": "zookeeper",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9100"
-        },
-        {
-            "entity_id": "1",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9101"
-        },
-        {
-            "entity_id": "2",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9102"
-        },
-        {
-            "entity_id": "3",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9103"
-        },
-        {
-            "entity_id": "4",
-            "hostname": "localhost",
-            "role": "broker",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9104"
-        },
-        {
-            "entity_id": "5",
-            "hostname": "localhost",
-            "role": "producer_performance",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9105"
-        },
-        {
-            "entity_id": "6",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9106"
-        },
-        {
-            "entity_id": "7",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9107"
-        },
-        {
-            "entity_id": "8",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9108"
-        },
-        {
-            "entity_id": "9",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9109"
-        },
-        {
-            "entity_id": "10",
-            "hostname": "localhost",
-            "role": "console_consumer",
-            "cluster_name":"source",
-            "kafka_home": "default",
-            "java_home": "default",
-            "jmx_port": "9110"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/kafka/blob/d50499a0/system_test/offset_management_testsuite/config/console_consumer.properties
----------------------------------------------------------------------
diff --git a/system_test/offset_management_testsuite/config/console_consumer.properties b/system_test/offset_management_testsuite/config/console_consumer.properties
deleted file mode 100644
index a2ab8b9..0000000
--- a/system_test/offset_management_testsuite/config/console_consumer.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-auto.offset.reset=smallest
-auto.commit.interval.ms=1000

http://git-wip-us.apache.org/repos/asf/kafka/blob/d50499a0/system_test/offset_management_testsuite/config/producer_performance.properties
----------------------------------------------------------------------
diff --git a/system_test/offset_management_testsuite/config/producer_performance.properties b/system_test/offset_management_testsuite/config/producer_performance.properties
deleted file mode 100644
index e69de29..0000000