summaryrefslogtreecommitdiffstats
path: root/v3po/api/src/main
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-12-15 11:37:42 +0100
committerJan Srnicek <jsrnicek@cisco.com>2016-12-16 08:35:08 +0000
commitce6b6c8c20db7c56b6b97835852d6d4cb3807c13 (patch)
tree031ba25955ffdeef19941dd4582f8876de0f3e36 /v3po/api/src/main
parentdf4a0a7e3ef449fee3916e7cfd874a3ab2a8c11b (diff)
HONEYCOMB-320: move ace-ip-and-eth case nodes into container
Change-Id: I6193d84363d60123571a72021ed8ad6e1d334a9b Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/api/src/main')
-rw-r--r--v3po/api/src/main/yang/vpp-classfier-acl.yang25
1 files changed, 14 insertions, 11 deletions
diff --git a/v3po/api/src/main/yang/vpp-classfier-acl.yang b/v3po/api/src/main/yang/vpp-classfier-acl.yang
index 99567799f..42550d95d 100644
--- a/v3po/api/src/main/yang/vpp-classfier-acl.yang
+++ b/v3po/api/src/main/yang/vpp-classfier-acl.yang
@@ -142,19 +142,22 @@ module vpp-classfier-acl {
case ace-ip-and-eth {
description
"Access List entry that can define both ip and eth rules.";
- choice ace-ip-version {
- description
- "IP version used in this Access List Entry.";
- mandatory true;
- case ace-ipv4 {
- uses packet-fields:acl-ipv4-header-fields;
- }
- case ace-ipv6 {
- uses packet-fields:acl-ipv6-header-fields;
+ container ace-ip-and-eth-nodes {
+
+ choice ace-ip-version {
+ description
+ "IP version used in this Access List Entry.";
+ mandatory true;
+ case ace-ipv4 {
+ uses packet-fields:acl-ipv4-header-fields;
+ }
+ case ace-ipv6 {
+ uses packet-fields:acl-ipv6-header-fields;
+ }
}
+ uses packet-fields:acl-ip-header-fields;
+ uses packet-fields:acl-eth-header-fields;
}
- uses packet-fields:acl-ip-header-fields;
- uses packet-fields:acl-eth-header-fields;
}
}
} \ No newline at end of file