pytest for everflow.

ansible/roles/test/files/acstests/everflow_policer_test.py

@@ -230,10 +230,12 @@ def checkMirroredFlow(self):
         masked_exp_pkt.set_do_not_care(38*8, len(payload)*8)  # don't match payload, payload will be matched by match_payload(pkt)
 
         def match_payload(pkt):
-            pkt = scapy.Ether(pkt).load
             if self.asic_type in ["mellanox"]:
+                pkt = scapy.Ether(pkt).load
                 pkt = pkt[22:] # Mask the Mellanox specific inner header
-            pkt = scapy.Ether(pkt)
+                pkt = scapy.Ether(pkt)
+            else:
+                pkt = scapy.Ether(pkt)[scapy.GRE].payload
 
             return dataplane.match_exp_pkt(payload_mask, pkt)
 

ansible/roles/test/tasks/everflow_testbed.yml

@@ -1,29 +1,4 @@
-- name: Get switch capabilities
-  include_tasks: "roles/test/tasks/everflow_testbed/get_capabilities_info.yml"
-
-- name: Get general port information
-  include_tasks: "roles/test/tasks/everflow_testbed/get_general_port_info.yml"
-
-- include_tasks: "roles/test/tasks/everflow_testbed/everflow_main.yml"
+- name: run test
+  include_tasks: roles/test/tasks/pytest_runner.yml
   vars:
-    mirror_stage: "ingress"
-    acl_stage: "ingress"
-  when: test_ingress_mirror_on_ingress_acl == true
-
-- include_tasks: "roles/test/tasks/everflow_testbed/everflow_main.yml"
-  vars:
-    mirror_stage: "egress"
-    acl_stage: "ingress"
-  when: test_egress_mirror_on_ingress_acl == true
-
-- include_tasks: "roles/test/tasks/everflow_testbed/everflow_main.yml"
-  vars:
-    mirror_stage: "ingress"
-    acl_stage: "egress"
-  when: test_ingress_mirror_on_egress_acl == true
-
-- include_tasks: "roles/test/tasks/everflow_testbed/everflow_main.yml"
-  vars:
-    mirror_stage: "egress"
-    acl_stage: "egress"
-  when: test_egress_mirror_on_egress_acl == true
+    test_node: test_everflow_testbed.py

tests/acstests

@@ -0,0 +1 @@
+../ansible/roles/test/files/acstests/

tests/templates/acl_rule_persistent-del.json

@@ -0,0 +1 @@
+../../ansible/roles/test/tasks/everflow_testbed/del_config/acl_rule_persistent-del.json

tests/templates/acl_rule_persistent.json.j2

@@ -0,0 +1 @@
+../../ansible/roles/test/tasks/everflow_testbed/apply_config/acl_rule_persistent.json.j2