From: Andrew Yourtchenko <ayourtch@gmail.com>
Date: Fri, 23 Mar 2018 11:20:56 +0000 (+0100)
Subject: acl-plugin: make test: do not use a debug CLI where API can be used
X-Git-Tag: v18.04-rc1~69
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=beca26622983018255d87b8031e39e517e4e4242;p=vpp.git

acl-plugin: make test: do not use a debug CLI where API can be used

Parsing the list of applied ACLs from the debug CLI output
is not a good idea, since the debug CLI can and will change.
Fix that.

Change-Id: Ia47214863f2658a54219f59cb974b5cbc536f862
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
---

diff --git a/test/test_acl_plugin_macip.py b/test/test_acl_plugin_macip.py
index bf87e02ecd9..b009fb4598b 100644
--- a/test/test_acl_plugin_macip.py
+++ b/test/test_acl_plugin_macip.py
@@ -287,13 +287,10 @@ class MethodHolder(VppTestCase):
         reply = self.vapi.macip_acl_dump()
         self.assertEqual(len(reply), 0)
 
-        intf_acls = self.vapi.ppcli("sh acl-plugin interface").split(
-            "\nsw_if_index")
+        intf_acls = self.vapi.acl_interface_list_dump()
         for i_a in intf_acls:
-            ia = i_a.split(":")
-            if len(ia) == 3:
-                sw_if_index = int(ia[0])
-                acl_index = int(ia[2])
+            sw_if_index = i_a.sw_if_index
+            for acl_index in i_a.acls:
                 self.vapi.acl_interface_add_del(sw_if_index, acl_index, 0)
                 self.vapi.acl_del(acl_index)