[kafka] branch 2.7 updated: MINOR: fix system tests sending ACLs through ZooKeeper (#9458)

[rsivaram]

This is an automated email from the ASF dual-hosted git repository.

rsivaram pushed a commit to branch 2.7
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/2.7 by this push:
     new 6e3d11c  MINOR: fix system tests sending ACLs through ZooKeeper (#9458)
6e3d11c is described below

commit 6e3d11c0c304da3929bdb5e073c094942d624a13
Author: Ron Dagostino <rdagost...@confluent.io>
AuthorDate: Tue Oct 20 08:13:50 2020 -0400

    MINOR: fix system tests sending ACLs through ZooKeeper (#9458)
    
    Reviewers: Rajini Sivaram <rajinisiva...@googlemail.com>
---
 tests/kafkatest/services/security/kafka_acls.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/kafkatest/services/security/kafka_acls.py 
b/tests/kafkatest/services/security/kafka_acls.py
index 96438bc..dcab271 100644
--- a/tests/kafkatest/services/security/kafka_acls.py
+++ b/tests/kafkatest/services/security/kafka_acls.py
@@ -50,7 +50,7 @@ class ACLs:
         :param force_use_zk_connection: forces the use of ZooKeeper when true, 
otherwise AdminClient is used when available
         """
         cmd = "%(cmd_prefix)s --add --topic=%(topic)s %(operation_flag)s 
--allow-principal=%(principal)s" % {
-            'cmd_prefix': 
kafka.kafka_acls_cmd_with_optional_security_settings(kafka, node, 
force_use_zk_connection),
+            'cmd_prefix': 
kafka.kafka_acls_cmd_with_optional_security_settings(node, 
force_use_zk_connection),
             'topic': topic,
             'operation_flag': operation_flag,
             'principal': principal
@@ -71,7 +71,7 @@ class ACLs:
 
         for operation in ['ClusterAction'] + 
additional_cluster_operations_to_grant:
             cmd = "%(cmd_prefix)s --add --cluster --operation=%(operation)s 
--allow-principal=%(principal)s" % {
-                'cmd_prefix': 
kafka.kafka_acls_cmd_with_optional_security_settings(kafka, node, 
force_use_zk_connection),
+                'cmd_prefix': 
kafka.kafka_acls_cmd_with_optional_security_settings(node, 
force_use_zk_connection),
                 'operation': operation,
                 'principal': principal
             }
@@ -116,7 +116,7 @@ class ACLs:
         node = kafka.nodes[0]
 
         cmd = "%(cmd_prefix)s --add --topic=%(topic)s --group=%(group)s 
--consumer --allow-principal=%(principal)s" % {
-            'cmd_prefix': 
kafka.kafka_acls_cmd_with_optional_security_settings(kafka, node, 
force_use_zk_connection),
+            'cmd_prefix': 
kafka.kafka_acls_cmd_with_optional_security_settings(node, 
force_use_zk_connection),
             'topic': topic,
             'group': group,
             'principal': principal