kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject [2/5] System Test - Update all testcase_xxxx_properties.json for properties keys uniform naming convention; kafka-688; patched by Jun Rao; reviewed by Jun Rao
Date Mon, 14 Jan 2013 22:31:43 GMT
http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json
b/system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json
index 47e0ffb..f61deaa 100644
--- a/system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json
+++ b/system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json
@@ -30,8 +30,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -39,8 +39,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -48,8 +48,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -69,7 +69,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_1/testcase_1_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_1/testcase_1_properties.json b/system_test/replication_testsuite/testcase_1/testcase_1_properties.json
index acc9645..25dd2e3 100644
--- a/system_test/replication_testsuite/testcase_1/testcase_1_properties.json
+++ b/system_test/replication_testsuite/testcase_1/testcase_1_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json
b/system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json
index dcc87b8..a87ca15 100644
--- a/system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json
+++ b/system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json
b/system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json
index 96b4467..808e002 100644
--- a/system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json
+++ b/system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json
b/system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json
index 1a79788..b590644 100644
--- a/system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json
+++ b/system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json
b/system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json
index 4dcad49..3a3b1ca 100644
--- a/system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json
+++ b/system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json
b/system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json
index 38429e1..68ff605 100644
--- a/system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json
+++ b/system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json
b/system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json
index 01ec09b..9edbace 100644
--- a/system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json
+++ b/system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json
b/system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json
index 1d37536..3c01464 100644
--- a/system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json
+++ b/system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json
b/system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json
index ad3f050..c333776 100644
--- a/system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json
+++ b/system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json
b/system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json
index f0049a2..b7716bb 100644
--- a/system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json
+++ b/system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json
b/system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json
index c8b2d2d..3f461b1 100644
--- a/system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json
+++ b/system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json
b/system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json
index f871978..c56019f 100644
--- a/system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json
+++ b/system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json
b/system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json
index 537f57e..cabc8b9 100644
--- a/system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json
+++ b/system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json
b/system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json
index dae87d6..ff96fde 100644
--- a/system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json
+++ b/system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json
b/system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json
index 21bebd2..2cce8cd 100644
--- a/system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json
+++ b/system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json
b/system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json
index 27b6a1b..a6208ac 100644
--- a/system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json
+++ b/system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json
b/system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json
index 94af29e..b4c657b 100644
--- a/system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json
+++ b/system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json
@@ -32,8 +32,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
@@ -42,8 +42,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.retention.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
@@ -86,7 +86,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -94,7 +94,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json
b/system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json
index 1a03724..9f9ea1c 100644
--- a/system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json
+++ b/system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json
@@ -34,8 +34,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "1048576",
+      "broker.id": "1",
+      "log.segment.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -43,8 +43,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "1048576",
+      "broker.id": "2",
+      "log.segment.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -52,8 +52,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "1048576",
+      "broker.id": "3",
+      "log.segment.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -75,7 +75,7 @@
     {
       "entity_id": "5",
       "topic": "t001",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "60000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer_10.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/utils/kafka_system_test_utils.py
----------------------------------------------------------------------
diff --git a/system_test/utils/kafka_system_test_utils.py b/system_test/utils/kafka_system_test_utils.py
index 293ef5a..9411405 100644
--- a/system_test/utils/kafka_system_test_utils.py
+++ b/system_test/utils/kafka_system_test_utils.py
@@ -418,11 +418,21 @@ def generate_overriden_props_files(testsuitePathname, testcaseEnv, systemTestEnv
                         logger.error("Unknown cluster name: " + clusterName, extra=d)
                         sys.exit(1)
 
+                    zeroSevenClient = "false"
+                    try:
+                        zeroSevenClient = tcCfg["07_client"]
+                    except:
+                        pass
+
                     addedCSVConfig = {}
                     addedCSVConfig["kafka.csv.metrics.dir"] = get_testcase_config_log_dir_pathname(testcaseEnv,
"broker", clusterCfg["entity_id"], "metrics") 
                     addedCSVConfig["kafka.metrics.polling.interval.secs"] = "5" 
                     addedCSVConfig["kafka.metrics.reporters"] = "kafka.metrics.KafkaCSVMetricsReporter"

                     addedCSVConfig["kafka.csv.metrics.reporter.enabled"] = "true"
+
+                    if zeroSevenClient == "true":
+                        addedCSVConfig["brokerid"] = tcCfg["brokerid"]
+
                     copy_file_with_dict_values(cfgTemplatePathname + "/server.properties",
                         cfgDestPathname + "/" + tcCfg["config_filename"], tcCfg, addedCSVConfig)
 
@@ -1916,7 +1926,7 @@ def get_controller_attributes(systemTestEnv, testcaseEnv):
         brokerid = line.rstrip('\n')
         controllerDict["brokerid"]  = brokerid
         controllerDict["entity_id"] = system_test_utils.get_data_by_lookup_keyval(
-                                          tcConfigsList, "brokerid", brokerid, "entity_id")
+                                          tcConfigsList, "broker.id", brokerid, "entity_id")
     return controllerDict
 
 def getMinCommonStartingOffset(systemTestEnv, testcaseEnv, clusterName="source"):


Mime
View raw message