From 16d190d24cfb3286ffd941d690c656d7e5d73928 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Thu, 14 Jun 2018 12:12:07 +0200
Subject: HC2VPP-343: enable validation for acl list

This patch moves all validation for acl list to VppAclValidator,
implementation of Validator interface brought by (HONEYCOMB-431):
https://gerrit.fd.io/r/#/c/14022/

To test <validate> RPC, run ncclient tests with:
./edit_config.py acl/copy_config_unsupported-acl-type.xml -v

Support for <validate> RPC requres:
https://gerrit.fd.io/r/#/c/14040/

Change-Id: Iea591a76022e893f6aaf2a52637f45cadb284e4e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 .../src/test/resources/acl/ipv4/ipv4-acl.json      | 17 +++++++
 .../resources/interface-acl/acl-references.json    | 57 ++++++++++++++++++++++
 .../test/resources/reference/acl-references.json   | 57 ----------------------
 3 files changed, 74 insertions(+), 57 deletions(-)
 create mode 100644 acl/acl-impl/src/test/resources/acl/ipv4/ipv4-acl.json
 create mode 100644 acl/acl-impl/src/test/resources/interface-acl/acl-references.json
 delete mode 100644 acl/acl-impl/src/test/resources/reference/acl-references.json

(limited to 'acl/acl-impl/src/test/resources')

diff --git a/acl/acl-impl/src/test/resources/acl/ipv4/ipv4-acl.json b/acl/acl-impl/src/test/resources/acl/ipv4/ipv4-acl.json
new file mode 100644
index 000000000..04a08ff44
--- /dev/null
+++ b/acl/acl-impl/src/test/resources/acl/ipv4/ipv4-acl.json
@@ -0,0 +1,17 @@
+{
+  "access-lists": {
+    "acl": [
+      {
+        "acl-name": "standard-acl",
+        "acl-type": "ipv4-acl",
+        "access-list-entries": {
+          "ace": [
+            {
+              "rule-name": "rule1"
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/acl/acl-impl/src/test/resources/interface-acl/acl-references.json b/acl/acl-impl/src/test/resources/interface-acl/acl-references.json
new file mode 100644
index 000000000..63c9e20c9
--- /dev/null
+++ b/acl/acl-impl/src/test/resources/interface-acl/acl-references.json
@@ -0,0 +1,57 @@
+{
+  "interfaces": {
+    "interface": [
+      {
+        "name": "eth0",
+        "acl": {
+          "ingress": {
+            "vpp-acls": [
+              {
+                "type": "vpp-acl:vpp-acl",
+                "name": "acl1"
+              }
+            ]
+          }
+        }
+      },
+      {
+        "name": "eth1",
+        "acl": {
+          "egress": {
+            "vpp-acls": [
+              {
+                "type": "vpp-acl:vpp-acl",
+                "name": "acl1"
+              }
+            ]
+          },
+          "ingress": {
+            "vpp-acls": [
+              {
+                "type": "vpp-acl:vpp-acl",
+                "name": "acl2"
+              }
+            ]
+          }
+        }
+      },
+      {
+        "name": "eth2",
+        "acl": {
+          "ingress": {
+            "vpp-acls": [
+              {
+                "type": "vpp-acl:vpp-acl",
+                "name": "acl1"
+              }
+            ],
+            "vpp-macip-acl": {
+              "name": "acl4",
+              "type": "vpp-acl:vpp-macip-acl"
+            }
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/acl/acl-impl/src/test/resources/reference/acl-references.json b/acl/acl-impl/src/test/resources/reference/acl-references.json
deleted file mode 100644
index 63c9e20c9..000000000
--- a/acl/acl-impl/src/test/resources/reference/acl-references.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "interfaces": {
-    "interface": [
-      {
-        "name": "eth0",
-        "acl": {
-          "ingress": {
-            "vpp-acls": [
-              {
-                "type": "vpp-acl:vpp-acl",
-                "name": "acl1"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth1",
-        "acl": {
-          "egress": {
-            "vpp-acls": [
-              {
-                "type": "vpp-acl:vpp-acl",
-                "name": "acl1"
-              }
-            ]
-          },
-          "ingress": {
-            "vpp-acls": [
-              {
-                "type": "vpp-acl:vpp-acl",
-                "name": "acl2"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth2",
-        "acl": {
-          "ingress": {
-            "vpp-acls": [
-              {
-                "type": "vpp-acl:vpp-acl",
-                "name": "acl1"
-              }
-            ],
-            "vpp-macip-acl": {
-              "name": "acl4",
-              "type": "vpp-acl:vpp-macip-acl"
-            }
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
-- 
cgit 1.2.3-korg