[everflow] align capability fetch with new swss implementation

ansible/library/acl_capabilities_facts.py

@@ -0,0 +1,54 @@
+#!/usr/bin/python
+
+import swsssdk
+from sonic_py_common import multi_asic
+DOCUMENTATION = '''
+module:         acl_capabilities_facts
+version_added:  "1.0"
+author:         Stepan Blyschak (stepanb@nvidia.com)
+short_description: Retrieve ACL capability information
+'''
+
+EXAMPLES = '''
+- name: Get ACL capability facts
+  acl_capabilities_facts:
+'''
+
+
+class AclCapabilityModule(object):
+    def __init__(self):
+        self.module = AnsibleModule(
+            argument_spec=dict(),
+            supports_check_mode=True)
+
+        self.out = None
+        self.facts = {}
+
+        return
+
+    def run(self):
+        """
+        Run ACL capabilities facts collection.
+        """
+        self.facts['acl_capabilities'] = {}
+        namespace_list = multi_asic.get_namespace_list()
+        swsssdk.SonicDBConfig.load_sonic_global_db_config()
+        conn = swsssdk.SonicV2Connector(namespace=namespace_list[0])
+        conn.connect(conn.STATE_DB)
+        keys = conn.keys(conn.STATE_DB, 'ACL_STAGE_CAPABILITY_TABLE|*')
+
+        for key in keys:
+            capab = conn.get_all(conn.STATE_DB, key)
+            self.facts['acl_capabilities'][key.split('|')[-1]] = capab
+
+        self.module.exit_json(ansible_facts=self.facts)
+
+
+def main():
+    AclCapabilityModule().run()
+
+
+from ansible.module_utils.basic import *
+if __name__ == "__main__":
+    main()
+

tests/everflow/everflow_test_utilities.py

@@ -63,6 +63,7 @@ def setup_info(duthosts, rand_one_dut_hostname, tbinfo):
     # Gather test facts
     mg_facts = duthost.get_extended_minigraph_facts(tbinfo)
     switch_capability_facts = duthost.switch_capabilities_facts()["ansible_facts"]
+    acl_capability_facts = duthost.acl_capabilities_facts()["ansible_facts"]
 
     # Get the list of T0/T2 ports
     # TODO: The ACL tests do something really similar, I imagine we could refactor this bit.
@@ -92,6 +93,7 @@ def setup_info(duthosts, rand_one_dut_hostname, tbinfo):
 
 
     switch_capabilities = switch_capability_facts["switch_capabilities"]["switch"]
+    acl_capabilities = acl_capability_facts["acl_capabilities"]
 
     test_mirror_v4 = switch_capabilities["MIRROR"] == "true"
     test_mirror_v6 = switch_capabilities["MIRRORV6"] == "true"
@@ -105,10 +107,10 @@ def setup_info(duthosts, rand_one_dut_hostname, tbinfo):
         test_egress_mirror_on_egress_acl = False
         test_egress_mirror_on_ingress_acl = False
     else:
-        test_ingress_mirror_on_ingress_acl = "MIRROR_INGRESS_ACTION" in switch_capabilities["ACL_ACTIONS|INGRESS"]
-        test_ingress_mirror_on_egress_acl = "MIRROR_INGRESS_ACTION" in switch_capabilities["ACL_ACTIONS|EGRESS"]
-        test_egress_mirror_on_egress_acl = "MIRROR_EGRESS_ACTION" in switch_capabilities["ACL_ACTIONS|EGRESS"]
-        test_egress_mirror_on_ingress_acl = "MIRROR_EGRESS_ACTION" in switch_capabilities["ACL_ACTIONS|INGRESS"]
+        test_ingress_mirror_on_ingress_acl = "MIRROR_INGRESS_ACTION" in acl_capabilities["INGRESS"]["action_list"]
+        test_ingress_mirror_on_egress_acl = "MIRROR_INGRESS_ACTION" in acl_capabilities["EGRESS"]["action_list"]
+        test_egress_mirror_on_egress_acl = "MIRROR_EGRESS_ACTION" in acl_capabilities["EGRESS"]["action_list"]
+        test_egress_mirror_on_ingress_acl = "MIRROR_EGRESS_ACTION" in acl_capabilities["INGRESS"]["action_list"]
 
     # Collects a list of interfaces, their port number for PTF, and the LAGs they are members of,
     # if applicable.