From 90d286c396eee2555b9a98b0af7fce292fce4879 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 17 Jan 2017 17:57:26 +0100
Subject: HONEYCOMB-330: fix acl tag handling

Acl tag in vpp's acl plugin is an ascii tag, so it should not be handled as hex string.

Change-Id: I801d5b72a4c20f78246288ea63d914b0b9f3564b
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 acl/acl-api/src/main/yang/interface-acl.yang | 14 --------------
 acl/acl-api/src/main/yang/vpp-acl.yang       | 12 ++++++++++++
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'acl/acl-api/src')

diff --git a/acl/acl-api/src/main/yang/interface-acl.yang b/acl/acl-api/src/main/yang/interface-acl.yang
index 29b85e860..aab82e566 100644
--- a/acl/acl-api/src/main/yang/interface-acl.yang
+++ b/acl/acl-api/src/main/yang/interface-acl.yang
@@ -27,16 +27,6 @@ module interface-acl {
 
   description "Augmentations to interfaces model to apply acls exposed by acl plugin of vpp";
 
-  grouping vpp-acl-base-attributes {
-    leaf tag {
-      type yang:hex-string {
-        length 64;
-      }
-      description
-        "Placeholder for ACL metadata. Value is stored in vpp, and returned in read requests. No processing involved.";
-    }
-  }
-
   grouping vpp-acls-base-attributes  {
     description
       "List of ACLs of vpp-acl type"; // TODO express constraint in the model if possible
@@ -51,8 +41,6 @@ module interface-acl {
       leaf name {
         type acl:access-control-list-ref;
       }
-
-      uses vpp-acl-base-attributes;
     }
   }
 
@@ -68,8 +56,6 @@ module interface-acl {
       leaf name {
         type acl:access-control-list-ref;
       }
-
-      uses vpp-acl-base-attributes;
     }
   }
 
diff --git a/acl/acl-api/src/main/yang/vpp-acl.yang b/acl/acl-api/src/main/yang/vpp-acl.yang
index 53818139d..6acdf50a2 100644
--- a/acl/acl-api/src/main/yang/vpp-acl.yang
+++ b/acl/acl-api/src/main/yang/vpp-acl.yang
@@ -238,4 +238,16 @@ module vpp-acl {
       }
     }
   }
+
+  augment /acl:access-lists/acl:acl {
+    ext:augment-identifier "vpp-acl-augmentation";
+    leaf tag {
+      type string {
+        length 1..63;
+      }
+      description
+        "ASCII tag that can be used as a placeholder for ACL metadata. Value is stored in vpp,
+         and returned in read requests. No processing involved.";
+    }
+  }
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg