X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftest_data%2Fhoneycomb%2Fplugin_acl.py;h=aeb55307de643fd0985477040e1624ed90204a99;hp=d9d2ecd90f6179886e5797f6f1d0d46f431f6e74;hb=b1ae6610f5cccfc89234c6a58db63c62026640fe;hpb=005e7e00d0e9b9d4c0796c998b88d639ee316033

diff --git a/resources/test_data/honeycomb/plugin_acl.py b/resources/test_data/honeycomb/plugin_acl.py
index d9d2ecd90f..aeb55307de 100644
--- a/resources/test_data/honeycomb/plugin_acl.py
+++ b/resources/test_data/honeycomb/plugin_acl.py
@@ -34,6 +34,7 @@ def get_variables(test_case, name):
         # Variables for control packet
         "src_ip": "16.0.0.1",
         "dst_ip": "16.0.1.1",
+        "src_net": "16.0.0.0",
         "dst_net": "16.0.1.0",
         "src_port": "1234",
         "dst_port": "1234",
@@ -120,6 +121,11 @@ def get_variables(test_case, name):
             "src_ip": "10::1",
             "dst_ip": "11::1",
             "dst_net": "11::",
+            # IPs for DUT interface setup
+            "dut_to_tg_if1_ip": "10::2",
+            "dut_to_tg_if2_ip": "20::2",
+            "prefix_length": 64,
+            "gateway": "20::1",
             # ICMP code and type for control packet
             "icmp_type": 1,
             "icmp_code": 0,
@@ -164,7 +170,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "deny": {}
+                            "deny": ["null"]
                         }
                     },
                     {
@@ -178,7 +184,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "permit": {}
+                            "permit": ["null"]
                         }
                     },
                 ]}
@@ -216,7 +222,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "deny": {}
+                            "deny": ["null"]
                         },
                     },
                     {
@@ -228,7 +234,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "permit": {}
+                            "permit": ["null"]
                         }
                     }
                 ]}
@@ -266,7 +272,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "deny": {}
+                            "deny": ["null"]
                         }
                     },
                     {
@@ -278,7 +284,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "permit": {}
+                            "permit": ["null"]
                         }
                     }
                 ]}
@@ -294,6 +300,7 @@ def get_variables(test_case, name):
                     "rule-name": "rule1",
                     "matches": {
                         "vpp-ace-nodes": {
+                            "source-ipv4-network": "0.0.0.0/0",
                             "tcp-nodes": {
                                 "destination-port-range": {
                                     "lower-port":
@@ -311,7 +318,7 @@ def get_variables(test_case, name):
                         }
                     },
                     "actions": {
-                        "deny": {}
+                        "deny": ["null"]
                     },
                 },
                     {
@@ -323,7 +330,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "permit": {}
+                            "permit": ["null"]
                         }
                     }
                 ]}
@@ -338,6 +345,7 @@ def get_variables(test_case, name):
                     "rule-name": "ports",
                     "matches": {
                         "vpp-ace-nodes": {
+                            "source-ipv4-network": "0.0.0.0/0",
                             "tcp-nodes": {
                                 "destination-port-range": {
                                     "lower-port":
@@ -355,7 +363,7 @@ def get_variables(test_case, name):
                         }
                     },
                     "actions": {
-                        "deny": {}
+                        "deny": ["null"]
                     },
                 },
                     {
@@ -367,7 +375,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "permit": {}
+                            "permit": ["null"]
                         }
                     }
                 ]}
@@ -383,6 +391,7 @@ def get_variables(test_case, name):
                         "rule-name": "rule1",
                         "matches": {
                             "vpp-ace-nodes": {
+                                "source-ipv4-network": "0.0.0.0/0",
                                 "icmp-nodes": {
                                     "icmp-type-range": {
                                         "first": "1",
@@ -396,7 +405,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "deny": {}
+                            "deny": ["null"]
                         },
                     },
                     {
@@ -408,7 +417,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "permit": {}
+                            "permit": ["null"]
                         }
                     }
                 ]}
@@ -424,6 +433,7 @@ def get_variables(test_case, name):
                         "rule-name": "rule1",
                         "matches": {
                             "vpp-ace-nodes": {
+                                "source-ipv6-network": "::/0",
                                 "icmp-v6-nodes": {
                                     "icmp-type-range": {
                                         "first": "1",
@@ -437,7 +447,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "deny": {}
+                            "deny": ["null"]
                         },
                     },
                     {
@@ -449,7 +459,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "permit": {}
+                            "permit": ["null"]
                         }
                     }
                 ]}
@@ -476,8 +486,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            # TODO: will be renamed in HC2VPP-57
-                            "vpp-acl:permit": {}
+                            "vpp-acl:permit-and-reflect": ["null"]
                         },
                     },
                 ]}
@@ -498,7 +507,7 @@ def get_variables(test_case, name):
                             }
                         },
                         "actions": {
-                            "deny": {}
+                            "deny": ["null"]
                         }
                     }
                 ]}