HC2VPP-291: ACL model bump

 - bump ACL yang models
 - fix ACL module implementation and validation
 - fix ACL Unit tests
 - update postman collection

Change-Id: Iaab64e6d92d17babc3ccef7921b41070c3716516
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

1 files changed, 281 insertions, 68 deletions

diff --git a/acl/acl_postman_collection.json b/acl/acl_postman_collection.json
index e96520fa1..5812715cd 100644..100755
--- a/acl/acl_postman_collection.json
+++ b/acl/acl_postman_collection.json
@@ -1,13 +1,12 @@
 {
 	"info": {
-		"_postman_id": "7d511277-9b9c-8a1c-2ad7-58618b778f72",
+      "_postman_id": "0c1948da-d645-4b5c-90f4-9b3074a5040f",
 		"name": "Hc2vpp RESTCONF calls for acl plugin",
 		"description": "Provides examples of RESTCONF calls for vpp's acl plugin, exposed\nin hc2vpp.",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
 	},
 	"item": [
 		{
-			"_postman_id": "76a3c744-d3c9-4326-9e53-6896c0220ea6",
 			"name": "Write mac_ip list",
 			"request": {
 				"method": "PUT",
@@ -23,10 +22,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"acl\": [\r\n      {\r\n        \"acl-name\": \"macip-acl\",\r\n        \"acl-type\": \"vpp-acl:vpp-macip-acl\",\r\n        \"access-list-entries\": {\r\n          \"ace\": [\r\n            {\r\n              \"rule-name\": \"macip-rule\",\r\n              \"matches\": {\r\n                \"vpp-macip-ace-nodes\": {\r\n                  \"source-ipv4-network\": \"192.168.2.2/32\",\r\n                  \"source-mac-address\": \"aa:aa:aa:aa:aa:aa\",\r\n                  \"source-mac-address-mask\": \"ff:00:00:00:00:00\"\r\n                }\r\n              },\r\n              \"actions\": {\r\n                \"permit\": [null]\r\n              }\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ]\r\n}"
+                  "raw": "{\n  \"acl\":\n    {\n      \"name\":\"macip-acl\",\n      \"type\":\"vpp-acl:vpp-macip-acl\",\n      \"aces\":{\n        \"ace\":[\n          {\n            \"name\":\"macip-rule\",\n            \"matches\":{\n              \n                \"eth\":{\n                  \"source-mac-address\":\"aa:aa:aa:aa:aa:aa\",\n                  \"source-mac-address-mask\":\"ff:00:00:00:00:00\"\n\n              },\n\n                \"ipv4\":{\n\n                    \"source-ipv4-network\":\"192.168.2.2/32\"\n\n\n              }\n            },\n              \n              \"actions\":{\n                \"forwarding\": \"ietf-access-control-list:accept\"\n              }\n          }\n        ]\n      }\n    }\n}"
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/config/ietf-access-control-list:access-lists/acl/vpp-acl:vpp-macip-acl/macip-acl",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/acl/macip-acl",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -35,9 +34,8 @@
 					"path": [
 						"restconf",
 						"config",
-						"ietf-access-control-list:access-lists",
+                      "ietf-access-control-list:acls",
 						"acl",
-						"vpp-acl:vpp-macip-acl",
 						"macip-acl"
 					]
 				}
@@ -45,8 +43,7 @@
 			"response": []
 		},
 		{
-			"_postman_id": "69d626eb-ef32-4b62-beef-8f91da807382",
-			"name": "Write icmp acl list",
+          "name": "Write tcp acl list",
 			"request": {
 				"method": "PUT",
 				"header": [
@@ -61,10 +58,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n \"acl\": [\r\n      {\r\n        \"acl-name\": \"icmp-acl\",\r\n        \"acl-type\": \"vpp-acl:vpp-acl\",\r\n        \"access-list-entries\": {\r\n          \"ace\": [\r\n            {\r\n              \"rule-name\": \"imcp-rule\",\r\n              \"matches\": {\r\n                \"vpp-ace-nodes\": {\r\n                  \"destination-ipv4-network\": \"192.168.2.1/24\",\r\n                  \"source-ipv4-network\": \"192.168.2.2/32\",\r\n                  \"icmp-nodes\": {\r\n                    \"icmp-type-range\": {\r\n                      \"first\": \"5\",\r\n                      \"last\": \"8\"\r\n                    },\r\n                    \"icmp-code-range\": {\r\n                      \"first\": \"1\",\r\n                      \"last\": \"3\"\r\n                    }\r\n                  }\r\n                }\r\n              },\r\n              \"actions\": {\r\n                \"permit\": [null]\r\n              }\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ]\r\n}"
+                  "raw": "{\n  \"acl\":\n    {\n      \"name\":\"tcp-acl\",\n      \"type\":\"vpp-acl:vpp-acl\",\n      \"aces\":{\n        \"ace\":[\n          {\n            \"name\":\"tcp-rule\",\n            \"matches\":{\n              \"ipv4\":{\n                \"destination-ipv4-network\":\"192.168.2.1/24\",\n                \"source-ipv4-network\":\"192.168.2.2/32\"\n              },\n              \"tcp\":{\n                \"source-port\":{\n                  \"lower-port\":\"1\",\n                  \"upper-port\":\"5487\"\n                },\n                \"destination-port\":{\n                  \"lower-port\":\"87\",\n                  \"upper-port\":\"6745\"\n                },\n                \"flags\":\"cwr ece urg\",\n                \"vpp-acl:vpp-tcp-ace\":{\n                  \"vpp-acl:flags-mask\":\"cwr\"\n                }\n              }\n            },\n            \"actions\":{\n              \"forwarding\":\"ietf-access-control-list:accept\"\n            }\n          }\n        ]\n      }\n    }\n}"
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/config/ietf-access-control-list:access-lists/acl/vpp-acl:vpp-acl/icmp-acl",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/acl/tcp-acl",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -73,18 +70,16 @@
 					"path": [
 						"restconf",
 						"config",
-						"ietf-access-control-list:access-lists",
+                      "ietf-access-control-list:acls",
 						"acl",
-						"vpp-acl:vpp-acl",
-						"icmp-acl"
+                      "tcp-acl"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"_postman_id": "39f40bc8-b30b-40e2-ae2d-b357a824f611",
-			"name": "Write tcp acl list",
+          "name": "Write udp acl list",
 			"request": {
 				"method": "PUT",
 				"header": [
@@ -99,10 +94,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"acl\": [\r\n      {\r\n        \"acl-name\": \"tcp-acl\",\r\n        \"acl-type\": \"vpp-acl:vpp-acl\",\r\n        \"access-list-entries\": {\r\n          \"ace\": [\r\n            {\r\n              \"rule-name\": \"tcp-rule\",\r\n              \"matches\": {\r\n                \"vpp-ace-nodes\": {\r\n                  \"destination-ipv4-network\": \"192.168.2.1/24\",\r\n                  \"source-ipv4-network\": \"192.168.2.2/32\",\r\n                  \"tcp-nodes\": {\r\n                    \"source-port-range\": {\r\n                      \"lower-port\": \"1\",\r\n                      \"upper-port\": \"5487\"\r\n                    },\r\n                    \"destination-port-range\": {\r\n                      \"lower-port\": \"87\",\r\n                      \"upper-port\": \"6745\"\r\n                    },\r\n                    \"tcp-flags-mask\": \"1\",\r\n                    \"tcp-flags-value\": \"7\"\r\n                  }\r\n                }\r\n              },\r\n              \"actions\": {\r\n                \"permit\": [null]\r\n              }\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ]\r\n}"
+                  "raw": "{\r\n  \"acl\":\r\n    {\r\n      \"name\":\"udp-acl\",\r\n      \"type\":\"vpp-acl:vpp-acl\",\r\n      \"aces\":{\r\n        \"ace\":[\r\n          {\r\n            \"name\":\"udp-rule\",\r\n            \"matches\":{\r\n              \"ipv4\":{\r\n                \"destination-ipv4-network\":\"192.168.2.1/24\",\r\n                \"source-ipv4-network\":\"192.168.2.2/32\"\r\n              },\r\n              \"udp\":{\r\n                \"source-port\":{\r\n                  \"lower-port\":\"1\",\r\n                  \"upper-port\":\"5487\"\r\n                },\r\n                \"destination-port\":{\r\n                  \"lower-port\":\"87\",\r\n                  \"upper-port\":\"6745\"\r\n                }\r\n              }\r\n            },\r\n            \"actions\":{\r\n              \"forwarding\":\"ietf-access-control-list:accept\"\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    }\r\n}"
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/config/ietf-access-control-list:access-lists/acl/vpp-acl:vpp-acl/tcp-acl",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/acl/udp-acl",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -111,17 +106,51 @@
 					"path": [
 						"restconf",
 						"config",
-						"ietf-access-control-list:access-lists",
+                      "ietf-access-control-list:acls",
 						"acl",
-						"vpp-acl:vpp-acl",
-						"tcp-acl"
+                      "udp-acl"
+                    ]
+                }
+            },
+          "response": []
+        },
+      {
+        "name": "Write icmp acl list",
+        "request": {
+          "method": "PUT",
+          "header": [
+            {
+              "key": "Authorization",
+              "value": "Basic YWRtaW46YWRtaW4="
+            },
+            {
+              "key": "Content-Type",
+              "value": "application/json"
+            }
+          ],
+          "body": {
+            "mode": "raw",
+            "raw": "{\n  \"acl\":\n    {\n      \"name\":\"icmp-acl\",\n      \"type\":\"vpp-acl:vpp-acl\",\n      \"aces\":{\n        \"ace\":[\n          {\n            \"name\":\"imcp-rule\",\n            \"matches\":{\n              \"ipv4\":{\n                \"source-ipv4-network\":\"192.168.2.2/32\",\n                \"destination-ipv4-network\":\"192.168.2.1/24\"\n              },\n              \"icmp\":{\n                \"vpp-acl:vpp-icmp-ace\":{\n                  \"vpp-acl:icmp-type-range\":{\n                    \"first\":\"5\",\n                    \"last\":\"8\"\n                  },\n                  \"vpp-acl:icmp-code-range\":{\n                    \"first\":\"1\",\n                    \"last\":\"3\"\n                  }\n                }\n              }\n            },\n            \"actions\":{\n              \"forwarding\":\"ietf-access-control-list:accept\"\n            }\n          }\n        ]\n      }\n    }\n}"
+          },
+          "url": {
+            "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/acl/icmp-acl",
+            "protocol": "http",
+            "host": [
+              "localhost"
+            ],
+            "port": "8183",
+            "path": [
+              "restconf",
+              "config",
+              "ietf-access-control-list:acls",
+              "acl",
+              "icmp-acl"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"_postman_id": "0b24a6ea-b894-427b-91af-74ae075e3dff",
 			"name": "Write icmp-v6 acl list",
 			"request": {
 				"method": "PUT",
@@ -137,10 +166,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"acl\": [\r\n      {\r\n        \"acl-name\": \"icmp-v6-acl\",\r\n        \"acl-type\": \"vpp-acl:vpp-acl\",\r\n        \"access-list-entries\": {\r\n          \"ace\": [\r\n            {\r\n              \"rule-name\": \"imcp-v6-rule\",\r\n              \"matches\": {\r\n                \"vpp-ace-nodes\": {\r\n                  \"destination-ipv6-network\": \"2001:0db8:0a0b:12f0:0000:0000:0000:0001/64\",\r\n                  \"source-ipv6-network\": \"2001:0db8:0a0b:12f0:0000:0000:0000:0002/48\",\r\n                  \"icmp-v6-nodes\": {\r\n                    \"icmp-type-range\": {\r\n                      \"first\": \"5\",\r\n                      \"last\": \"8\"\r\n                    },\r\n                    \"icmp-code-range\": {\r\n                      \"first\": \"1\",\r\n                      \"last\": \"3\"\r\n                    }\r\n                  }\r\n                }\r\n              },\r\n              \"actions\": {\r\n                \"permit\": [null]\r\n              }\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ]\r\n}"
+                  "raw": "{\n  \"acl\":\n    {\n      \"name\":\"icmp-v6-acl\",\n      \"type\":\"vpp-acl:vpp-acl\",\n      \"aces\":{\n        \"ace\":[\n          {\n            \"name\":\"imcp-v6-rule\",\n            \"matches\":{\n              \"ipv6\":{\n                \"source-ipv6-network\":\"2001:0db8:0a0b:12f0:0000:0000:0000:0002/48\",\n                \"destination-ipv6-network\":\"2001:0db8:0a0b:12f0:0000:0000:0000:0001/64\"\n              },\n              \"icmp\":{\n                \"vpp-acl:vpp-icmp-ace\":{\n                  \"vpp-acl:icmp-type-range\":{\n                    \"first\":\"5\",\n                    \"last\":\"8\"\n                  },\n                  \"vpp-acl:icmp-code-range\":{\n                    \"first\":\"1\",\n                    \"last\":\"3\"\n                  }\n                }\n              }\n            },\n            \"actions\":{\n              \"forwarding\":\"ietf-access-control-list:accept\"\n            }\n          }\n        ]\n      }\n    }\n}"
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/config/ietf-access-control-list:access-lists/acl/vpp-acl:vpp-acl/icmp-v6-acl",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/acl/icmp-v6-acl",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -149,9 +178,8 @@
 					"path": [
 						"restconf",
 						"config",
-						"ietf-access-control-list:access-lists",
+                      "ietf-access-control-list:acls",
 						"acl",
-						"vpp-acl:vpp-acl",
 						"icmp-v6-acl"
 					]
 				}
@@ -159,10 +187,82 @@
 			"response": []
 		},
 		{
-			"_postman_id": "4614b547-11f8-42d8-be28-fcac6af5f6f4",
-			"name": "Write udp acl list",
+          "name": "Read interface ACLs (operational)",
 			"request": {
-				"method": "PUT",
+              "method": "GET",
+              "header": [
+                {
+                  "key": "Authorization",
+                  "value": "Basic YWRtaW46YWRtaW4="
+                },
+                {
+                  "key": "Content-Type",
+                  "value": "application/json"
+                }
+              ],
+              "body": {
+                "mode": "raw",
+                "raw": ""
+              },
+              "url": {
+                "raw": "http://localhost:8183/restconf/operational/ietf-access-control-list:acls/attachment-points/",
+                "protocol": "http",
+                "host": [
+                  "localhost"
+                ],
+                "port": "8183",
+                "path": [
+                  "restconf",
+                  "operational",
+                  "ietf-access-control-list:acls",
+                  "attachment-points",
+                  ""
+                ]
+              }
+            },
+          "response": []
+        },
+      {
+        "name": "Read interface ACLs (config)",
+        "request": {
+          "method": "GET",
+          "header": [
+            {
+              "key": "Authorization",
+              "value": "Basic YWRtaW46YWRtaW4="
+            },
+            {
+              "key": "Content-Type",
+              "value": "application/json"
+            }
+          ],
+          "body": {
+            "mode": "raw",
+            "raw": ""
+          },
+          "url": {
+            "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/attachment-points/interface/local0",
+            "protocol": "http",
+            "host": [
+              "localhost"
+            ],
+            "port": "8183",
+            "path": [
+              "restconf",
+              "config",
+              "ietf-access-control-list:acls",
+              "attachment-points",
+              "interface",
+              "local0"
+            ]
+          }
+        },
+        "response": []
+      },
+      {
+        "name": "Read ACLs (cfg)",
+        "request": {
+          "method": "GET",
 				"header": [
 					{
 						"key": "Authorization",
@@ -175,10 +275,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"acl\": [\r\n      {\r\n        \"acl-name\": \"udp-acl\",\r\n        \"acl-type\": \"vpp-acl:vpp-acl\",\r\n        \"access-list-entries\": {\r\n          \"ace\": [\r\n            {\r\n              \"rule-name\": \"udp-rule\",\r\n              \"matches\": {\r\n                \"vpp-ace-nodes\": {\r\n                  \"destination-ipv4-network\": \"192.168.2.1/24\",\r\n                  \"source-ipv4-network\": \"192.168.2.2/32\",\r\n                  \"udp-nodes\": {\r\n                    \"source-port-range\": {\r\n                      \"lower-port\": \"1\",\r\n                      \"upper-port\": \"5487\"\r\n                    },\r\n                    \"destination-port-range\": {\r\n                      \"lower-port\": \"87\",\r\n                      \"upper-port\": \"6745\"\r\n                    }\r\n                  }\r\n                }\r\n              },\r\n              \"actions\": {\r\n                \"permit\": [null]\r\n              }\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ]\r\n}"
+                  "raw": ""
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/config/ietf-access-control-list:access-lists/acl/vpp-acl:vpp-acl/udp-acl",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -187,17 +287,49 @@
 					"path": [
 						"restconf",
 						"config",
-						"ietf-access-control-list:access-lists",
-						"acl",
-						"vpp-acl:vpp-acl",
-						"udp-acl"
+                      "ietf-access-control-list:acls",
+                      ""
+                    ]
+                }
+        },
+        "response": []
+      },
+      {
+        "name": "Read ACLs (oper)",
+        "request": {
+          "method": "GET",
+          "header": [
+            {
+              "key": "Authorization",
+              "value": "Basic YWRtaW46YWRtaW4="
+            },
+            {
+              "key": "Content-Type",
+              "value": "application/json"
+            }
+          ],
+          "body": {
+            "mode": "raw",
+            "raw": ""
+          },
+          "url": {
+            "raw": "http://localhost:8183/restconf/operational/ietf-access-control-list:acls/",
+            "protocol": "http",
+            "host": [
+              "localhost"
+            ],
+            "port": "8183",
+            "path": [
+              "restconf",
+              "operational",
+              "ietf-access-control-list:acls",
+              ""
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"_postman_id": "c33624c1-ff25-4227-bf86-4fbdb5d143c5",
 			"name": "Assign ACLs as ingress to local0",
 			"request": {
 				"method": "PUT",
@@ -213,10 +345,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"ingress\": {\n      \"vpp-acls\": [\n            {\n                \"type\" : \"vpp-acl:vpp-acl\",\n                \"name\" : \"tcp-acl\"\n            },\n            {\n                \"type\" : \"vpp-acl:vpp-acl\",\n                \"name\" : \"udp-acl\"\n            }\n        ]\n    }\n}"
+                  "raw": "{\n\t\"acl-sets\" : {\n\t\t\"acl-set\" : [\n\t\t\t{\n\t\t\t\t\"name\" : \"tcp-acl\"\t\n\t\t\t},\n\t\t\t{\n\t\t\t\t\"name\" : \"udp-acl\"\t\n\t\t\t}\n\t\t\t]\n\t}\n}\n"
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-acl:acl/ingress",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/attachment-points/interface/local0/ingress/acl-sets/",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -225,10 +357,50 @@
 					"path": [
 						"restconf",
 						"config",
-						"ietf-interfaces:interfaces",
+                      "ietf-access-control-list:acls",
+                      "attachment-points",
 						"interface",
 						"local0",
-						"interface-acl:acl",
+                      "ingress",
+                      "acl-sets",
+                      ""
+                    ]
+                }
+            },
+          "response": []
+        },
+      {
+        "name": "Delete ACLs as ingress from local0",
+        "request": {
+          "method": "DELETE",
+          "header": [
+            {
+              "key": "Authorization",
+              "value": "Basic YWRtaW46YWRtaW4="
+            },
+            {
+              "key": "Content-Type",
+              "value": "application/json"
+            }
+          ],
+          "body": {
+            "mode": "raw",
+            "raw": ""
+          },
+          "url": {
+            "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/attachment-points/interface/local0/ingress",
+            "protocol": "http",
+            "host": [
+              "localhost"
+            ],
+            "port": "8183",
+            "path": [
+              "restconf",
+              "config",
+              "ietf-access-control-list:acls",
+              "attachment-points",
+              "interface",
+              "local0",
 						"ingress"
 					]
 				}
@@ -236,7 +408,6 @@
 			"response": []
 		},
 		{
-			"_postman_id": "bdf2b03d-d373-4511-95fd-6be666390db3",
 			"name": "Assign macip ACL to local0",
 			"request": {
 				"method": "PUT",
@@ -252,10 +423,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n\t\"vpp-macip-acl\": {\n\t\t\"type\" : \"vpp-acl:vpp-macip-acl\",\n\t\t\"name\" : \"macip-acl\"\n    }\n}"
+                  "raw": "{\n\t\"acl-set\": {\n\t\t\"name\" : \"macip-acl\"\n\t}\n}"
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-acl:acl/ingress/vpp-macip-acl",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/attachment-points/interface/local0/ingress/acl-sets/acl-set/macip-acl",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -264,20 +435,62 @@
 					"path": [
 						"restconf",
 						"config",
-						"ietf-interfaces:interfaces",
+                      "ietf-access-control-list:acls",
+                      "attachment-points",
 						"interface",
 						"local0",
-						"interface-acl:acl",
 						"ingress",
-						"vpp-macip-acl"
+                      "acl-sets",
+                      "acl-set",
+                      "macip-acl"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"_postman_id": "388656cf-05de-4649-82fe-41b132501936",
-			"name": "Read ACLs (cfg)",
+          "name": "delete macip ACL from local0",
+          "request": {
+            "method": "DELETE",
+            "header": [
+              {
+                "key": "Authorization",
+                "value": "Basic YWRtaW46YWRtaW4="
+              },
+              {
+                "key": "Content-Type",
+                "value": "application/json"
+              }
+            ],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/attachment-points/interface/local0/ingress/acl-sets/acl-set/macip-acl",
+              "protocol": "http",
+              "host": [
+                "localhost"
+              ],
+              "port": "8183",
+              "path": [
+                "restconf",
+                "config",
+                "ietf-access-control-list:acls",
+                "attachment-points",
+                "interface",
+                "local0",
+                "ingress",
+                "acl-sets",
+                "acl-set",
+                "macip-acl"
+              ]
+            }
+          },
+          "response": []
+        },
+      {
+        "name": "Read ACLs assigned to local0 (cfg)",
 			"request": {
 				"method": "GET",
 				"header": [
@@ -292,10 +505,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"testInterface\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"iana-if-type:ethernetCsmacd\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"ietf-ip:ipv4\": {\r\n                    \"enabled\": \"true\",\r\n                    \"mtu\": \"1500\",\r\n                    \"address\": [\r\n                        {\r\n                            \"ip\": \"1.2.3.0\",\r\n                            \"netmask\": \"255.255.255.0\"\r\n                        }\r\n                    ]\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
+                  "raw": ""
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/config/ietf-access-control-list:access-lists/",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/attachment-points/interface/local0",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -304,18 +517,19 @@
 					"path": [
 						"restconf",
 						"config",
-						"ietf-access-control-list:access-lists",
-						""
+                      "ietf-access-control-list:acls",
+                      "attachment-points",
+                      "interface",
+                      "local0"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"_postman_id": "4d76b60a-61fd-4213-862e-08a69eb73b9d",
-			"name": "Read ingress ACLs assigned to local0",
+          "name": "Assign ACLs as egress to local0",
 			"request": {
-				"method": "GET",
+              "method": "PUT",
 				"header": [
 					{
 						"key": "Authorization",
@@ -328,10 +542,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"ingress\": {\n      \"vpp-acls\": [\n            {\n                \"type\" : \"vpp-acl:vpp-acl\",\n                \"name\" : \"tcp-acl\"\n            },\n            {\n                \"type\" : \"vpp-acl:vpp-acl\",\n                \"name\" : \"udp-acl\"\n            }\n        ]\n    }\n}"
+                  "raw": "{\n\t\"egress\" : {\n\t\t\"acl-sets\" : {\n\t\t\t\"acl-set\" : [\n\t\t\t\t{\n\t\t\t\t\t\"name\" : \"tcp-acl\"\t\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t\"name\" : \"udp-acl\"\t\n\t\t\t\t}\n\t\t\t\t]\n\t\t}\n\t}\n}\n"
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/operational/ietf-interfaces:interfaces-state/interface/local0/interface-acl:acl/ingress",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/attachment-points/interface/local0/egress",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -339,22 +553,21 @@
 					"port": "8183",
 					"path": [
 						"restconf",
-						"operational",
-						"ietf-interfaces:interfaces-state",
+                      "config",
+                      "ietf-access-control-list:acls",
+                      "attachment-points",
 						"interface",
 						"local0",
-						"interface-acl:acl",
-						"ingress"
+                      "egress"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"_postman_id": "986a53c8-7a95-449b-93f4-8bb7ee5112b6",
-			"name": "Read ACLs assigned to local0 (cfg)",
+          "name": "Delete ACLs as egress from local0",
 			"request": {
-				"method": "GET",
+              "method": "DELETE",
 				"header": [
 					{
 						"key": "Authorization",
@@ -367,10 +580,10 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"ingress\": {\n      \"vpp-acls\": [\n            {\n                \"type\" : \"vpp-acl:vpp-acl\",\n                \"name\" : \"tcp-acl\"\n            },\n            {\n                \"type\" : \"vpp-acl:vpp-acl\",\n                \"name\" : \"udp-acl\"\n            }\n        ]\n    }\n}"
+                  "raw": ""
 				},
 				"url": {
-					"raw": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-acl:acl/ingress",
+                  "raw": "http://localhost:8183/restconf/config/ietf-access-control-list:acls/attachment-points/interface/local0/egress",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -379,11 +592,11 @@
 					"path": [
 						"restconf",
 						"config",
-						"ietf-interfaces:interfaces",
+                      "ietf-access-control-list:acls",
+                      "attachment-points",
 						"interface",
 						"local0",
-						"interface-acl:acl",
-						"ingress"
+                      "egress"
 					]
 				}
 			},