summaryrefslogtreecommitdiffstats
path: root/acl/acl-api/src/main
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-01-17 17:57:26 +0100
committerJan Srnicek <jsrnicek@cisco.com>2017-01-18 12:51:19 +0000
commit90d286c396eee2555b9a98b0af7fce292fce4879 (patch)
tree9618fbfe800e4c98754c0659ed7401c588810476 /acl/acl-api/src/main
parent75f8aa0f9a1ff45f1be500304fb156a13fb6e6ef (diff)
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>
Diffstat (limited to 'acl/acl-api/src/main')
-rw-r--r--acl/acl-api/src/main/yang/interface-acl.yang14
-rw-r--r--acl/acl-api/src/main/yang/vpp-acl.yang12
2 files changed, 12 insertions, 14 deletions
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