verifiable_client: set topic configs on default.topic.config

edenhill · edenhill · commit 9ef9baa718a6 · 2018-08-27T21:29:08.000+02:00
..until we get global fallthru working properly.
diff --git a/confluent_kafka/kafkatest/verifiable_client.py b/confluent_kafka/kafkatest/verifiable_client.py
@@ -71,6 +71,13 @@ def set_config(conf, args):
             if v is None:
                 continue
 
+            if n.startswith('topicconf_'):
+                # Apply topicconf_ properties on default.topic.config
+                if 'default.topic.config' not in conf:
+                    conf['default.topic.config'] = dict()
+                conf['default.topic.config'][n[10:]] = v
+                continue
+
             if not n.startswith('conf_'):
                 # App config, skip
                 continue
diff --git a/confluent_kafka/kafkatest/verifiable_consumer.py b/confluent_kafka/kafkatest/verifiable_consumer.py
@@ -248,7 +248,7 @@ def to_dict(self):
     parser.add_argument('--enable-autocommit', action='store_true', dest='conf_enable.auto.commit', default=False)
     parser.add_argument('--max-messages', type=int, dest='max_messages', default=-1)
     parser.add_argument('--assignment-strategy', dest='conf_partition.assignment.strategy')
-    parser.add_argument('--reset-policy', dest='conf_auto.offset.reset', default='earliest')
+    parser.add_argument('--reset-policy', dest='topicconf_auto.offset.reset', default='earliest')
     parser.add_argument('--consumer.config', dest='consumer_config')
     parser.add_argument('-X', nargs=1, dest='extra_conf', action='append', help='Configuration property', default=[])
     args = vars(parser.parse_args())
diff --git a/confluent_kafka/kafkatest/verifiable_producer.py b/confluent_kafka/kafkatest/verifiable_producer.py
@@ -66,7 +66,7 @@ def dr_cb(self, err, msg):
     parser.add_argument('--broker-list', dest='conf_bootstrap.servers', required=True)
     parser.add_argument('--max-messages', type=int, dest='max_msgs', default=1000000)  # avoid infinite
     parser.add_argument('--value-prefix', dest='value_prefix', type=str, default=None)
-    parser.add_argument('--acks', type=int, dest='conf_request.required.acks', default=-1)
+    parser.add_argument('--acks', type=int, dest='topicconf_request.required.acks', default=-1)
     parser.add_argument('--message-create-time', type=int, dest='create_time', default=0)
     parser.add_argument('--producer.config', dest='producer_config')
     parser.add_argument('-X', nargs=1, dest='extra_conf', action='append', help='Configuration property', default=[])
