summaryrefslogtreecommitdiffstats
path: root/acl/acl-api
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-03-21 14:14:46 +0100
committerMarek Gradzki <mgradzki@cisco.com>2018-03-21 14:15:03 +0100
commitf4c8719359090b6c5f9030ce856ce778783ac23d (patch)
treed3e7a27c1cc0a21f841fe2c13aa498b0d2cacc44 /acl/acl-api
parent9abac30c6b7bab8b515bd721dad461d01c28d2e5 (diff)
acl: fix issues found by pyang
Fixes order of import statements, removes unused imports, etc. Change-Id: I53238e6b8bd217964b8951215b580f59e254bb9e Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'acl/acl-api')
-rw-r--r--acl/acl-api/src/main/yang/interface-acl@2016-12-14.yang21
-rw-r--r--acl/acl-api/src/main/yang/vpp-acl-context@2017-01-04.yang14
-rw-r--r--acl/acl-api/src/main/yang/vpp-acl@2017-06-15.yang20
3 files changed, 25 insertions, 30 deletions
diff --git a/acl/acl-api/src/main/yang/interface-acl@2016-12-14.yang b/acl/acl-api/src/main/yang/interface-acl@2016-12-14.yang
index aab82e566..238bee11d 100644
--- a/acl/acl-api/src/main/yang/interface-acl@2016-12-14.yang
+++ b/acl/acl-api/src/main/yang/interface-acl@2016-12-14.yang
@@ -3,23 +3,13 @@ module interface-acl {
namespace "urn:opendaylight:params:xml:ns:yang:interface:acl";
prefix "ifc-acl";
- revision "2016-12-14" {
- description "Initial revision of interface-acl model";
- }
-
import ietf-interfaces {
prefix "if";
}
+
import yang-ext {
prefix "ext";
}
- import ietf-yang-types {
- prefix "yang";
- }
-
- import vpp-acl {
- prefix "vpp-acl";
- }
import ietf-access-control-list {
prefix "acl";
@@ -27,9 +17,13 @@ module interface-acl {
description "Augmentations to interfaces model to apply acls exposed by acl plugin of vpp";
+ revision "2016-12-14" {
+ description "Initial revision of interface-acl model";
+ }
+
grouping vpp-acls-base-attributes {
description
- "List of ACLs of vpp-acl type"; // TODO express constraint in the model if possible
+ "List of ACLs of vpp-acl type"; // TODO(HC2VPP-201): express constraint in the model if possible
list vpp-acls {
key "type name";
ordered-by user;
@@ -38,6 +32,7 @@ module interface-acl {
type acl:acl-type;
}
+ // FIXME(HC2VPP-290): define leafref in interface-acl or bump ietf-access-control-list
leaf name {
type acl:access-control-list-ref;
}
@@ -47,7 +42,7 @@ module interface-acl {
grouping vpp-macip-acls-base-attributes {
container vpp-macip-acl {
description
- "ACL of vpp-macip-acl type"; // TODO express constraint in the model if possible
+ "ACL of vpp-macip-acl type"; // TODO(HC2VPP-201): express constraint in the model if possible
leaf type {
type acl:acl-type;
diff --git a/acl/acl-api/src/main/yang/vpp-acl-context@2017-01-04.yang b/acl/acl-api/src/main/yang/vpp-acl-context@2017-01-04.yang
index fde7f6346..825f280f2 100644
--- a/acl/acl-api/src/main/yang/vpp-acl-context@2017-01-04.yang
+++ b/acl/acl-api/src/main/yang/vpp-acl-context@2017-01-04.yang
@@ -1,13 +1,7 @@
module vpp-acl-context {
yang-version 1;
namespace "urn:opendaylight:params:xml:ns:yang:vpp:acl:context";
- prefix "nc";
-
- description "Context for vpp-acl assignment mapping";
-
- revision "2017-01-04" {
- description "Initial revision.";
- }
+ prefix "vac";
import naming-context {
prefix "nc";
@@ -17,6 +11,12 @@ module vpp-acl-context {
prefix "ext";
}
+ description "Context for vpp-acl assignment mapping";
+
+ revision "2017-01-04" {
+ description "Initial revision.";
+ }
+
grouping vpp-acl-context-attributes {
container vpp-acl-mappings {
list vpp-acl-context {
diff --git a/acl/acl-api/src/main/yang/vpp-acl@2017-06-15.yang b/acl/acl-api/src/main/yang/vpp-acl@2017-06-15.yang
index dfc1d890b..910376886 100644
--- a/acl/acl-api/src/main/yang/vpp-acl@2017-06-15.yang
+++ b/acl/acl-api/src/main/yang/vpp-acl@2017-06-15.yang
@@ -3,16 +3,6 @@ module vpp-acl {
namespace "urn:opendaylight:params:xml:ns:yang:vpp:acl";
prefix "vpp-acl";
- revision "2017-06-15" {
- description
- "Renamed stateful/permit leaf to permit-and-reflect";
- }
-
- revision "2016-12-14" {
- description
- "Initial revision of vpp-acl model.";
- }
-
import ietf-access-control-list {
prefix "acl";
}
@@ -33,6 +23,16 @@ module vpp-acl {
prefix yang;
}
+ revision "2017-06-15" {
+ description
+ "Renamed stateful/permit leaf to permit-and-reflect";
+ }
+
+ revision "2016-12-14" {
+ description
+ "Initial revision of vpp-acl model.";
+ }
+
augment /acl:access-lists/acl:acl/acl:access-list-entries/acl:ace/acl:actions/acl:packet-handling {
ext:augment-identifier "stateful-acl-action-augmentation";
when "../acl:matches/acl:ace-type = 'vpp-acl:vpp-acl'";