summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-03-22 14:02:49 +0100
committerMarek Gradzki <mgradzki@cisco.com>2018-03-22 14:02:49 +0100
commit2d8a3984bb5fff1791b54210079050b4241ab544 (patch)
treeacb3217bf1ccf06f2e1d0c4a627796b515880a5a
parent69342de1844ed0d8a0e53f8f04c10e0725c44ce1 (diff)
vpp-classifier: fix issues found by pyang
Change-Id: Ice51b4974a37e4097787e47d735da8849f6d816f Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r--vpp-classifier/api/src/main/yang/interface-policer@2017-03-15.yang20
-rw-r--r--vpp-classifier/api/src/main/yang/policer@2017-03-15.yang8
-rw-r--r--vpp-classifier/api/src/main/yang/vpp-classifier-acl@2017-05-03.yang12
-rw-r--r--vpp-classifier/api/src/main/yang/vpp-classifier@2017-03-27.yang28
-rw-r--r--vpp-classifier/api/src/main/yang/vpp-interface-acl@2017-03-15.yang10
-rw-r--r--vpp-classifier/api/src/main/yang/vpp-subinterface-acl@2017-03-15.yang10
6 files changed, 41 insertions, 47 deletions
diff --git a/vpp-classifier/api/src/main/yang/interface-policer@2017-03-15.yang b/vpp-classifier/api/src/main/yang/interface-policer@2017-03-15.yang
index 9bd21317a..fb4f8b0b4 100644
--- a/vpp-classifier/api/src/main/yang/interface-policer@2017-03-15.yang
+++ b/vpp-classifier/api/src/main/yang/interface-policer@2017-03-15.yang
@@ -4,16 +4,6 @@ module interface-policer {
namespace "urn:opendaylight:params:xml:ns:yang:interface:policer";
prefix "ifc-policer";
- description
- "This YANG module defines policer configuration and
- operational data for interfaces in VPP.
- Mapped to policer_classify_set_interface:
- https://git.fd.io/vpp/tree/src/vnet/classify/classify.api#n119";
-
- revision "2017-03-15" {
- description "Initial revision of interface-policer model";
- }
-
import vpp-classifier {
prefix "vpp-classifier";
}
@@ -26,6 +16,16 @@ module interface-policer {
prefix "ext";
}
+ description
+ "This YANG module defines policer configuration and
+ operational data for interfaces in VPP.
+ Mapped to policer_classify_set_interface:
+ https://git.fd.io/vpp/tree/src/vnet/classify/classify.api#n119";
+
+ revision "2017-03-15" {
+ description "Initial revision of interface-policer model";
+ }
+
grouping interface-policer-attributes {
container policer {
description
diff --git a/vpp-classifier/api/src/main/yang/policer@2017-03-15.yang b/vpp-classifier/api/src/main/yang/policer@2017-03-15.yang
index 637967128..fa2b8f049 100644
--- a/vpp-classifier/api/src/main/yang/policer@2017-03-15.yang
+++ b/vpp-classifier/api/src/main/yang/policer@2017-03-15.yang
@@ -4,6 +4,10 @@ module policer {
namespace "urn:opendaylight:params:xml:ns:yang:policer";
prefix "policer";
+ import ietf-inet-types {
+ prefix inet;
+ }
+
description
"VPP specific configuration of policer messages. Mapped to policer API:
https://git.fd.io/vpp/tree/src/vnet/policer/policer.api
@@ -18,10 +22,6 @@ module policer {
description "Initial revision of policer model";
}
- import ietf-inet-types {
- prefix inet;
- }
-
typedef policer-ref {
type leafref {
path "/policers/policer/name";
diff --git a/vpp-classifier/api/src/main/yang/vpp-classifier-acl@2017-05-03.yang b/vpp-classifier/api/src/main/yang/vpp-classifier-acl@2017-05-03.yang
index 6dc028e16..fe3007dbb 100644
--- a/vpp-classifier/api/src/main/yang/vpp-classifier-acl@2017-05-03.yang
+++ b/vpp-classifier/api/src/main/yang/vpp-classifier-acl@2017-05-03.yang
@@ -3,6 +3,10 @@ module vpp-classifier-acl {
namespace "urn:opendaylight:params:xml:ns:yang:vpp:classifier:acl";
prefix "vpp-classifier-acl";
+ import vpp-classifier {
+ prefix "vpp-classifier";
+ }
+
revision "2017-05-03" {
description
"Removed support for ietf based acls.";
@@ -13,14 +17,6 @@ module vpp-classifier-acl {
"Initial revision of vpp-classifier-acl model.";
}
- import vpp-classifier {
- prefix "vpp-classifier";
- }
-
- import yang-ext {
- prefix "ext";
- }
-
typedef interface-mode {
type enumeration {
enum "l2";
diff --git a/vpp-classifier/api/src/main/yang/vpp-classifier@2017-03-27.yang b/vpp-classifier/api/src/main/yang/vpp-classifier@2017-03-27.yang
index 574ed942a..5e3b8764c 100644
--- a/vpp-classifier/api/src/main/yang/vpp-classifier@2017-03-27.yang
+++ b/vpp-classifier/api/src/main/yang/vpp-classifier@2017-03-27.yang
@@ -3,23 +3,31 @@ module vpp-classifier {
namespace "urn:opendaylight:params:xml:ns:yang:vpp:classifier";
prefix "vpp-classifier";
+ import ietf-yang-types {
+ prefix "yang";
+ }
+
+ import policer {
+ prefix "policer";
+ }
+
revision "2017-03-27" {
description
"This revision updates classify table ref to be compatible with LeafRefContext
(ODL tool for checking leafrefs in runtime)";
}
- revision "2016-03-15" {
- description
- "This revision adds policer support";
- }
-
revision "2016-12-14" {
description
"This revision adds the following new features:
- updates order of union types for opaque-index";
}
+ revision "2016-03-15" {
+ description
+ "This revision adds policer support";
+ }
+
revision "2015-06-03" {
description
"Initial revision of model for VPP packet classifier.
@@ -30,16 +38,6 @@ module vpp-classifier {
"https://wiki.fd.io/view/VPP/Introduction_To_N-tuple_Classifiers";
}
- // TODO add revision (policer inclusion)
-
- import ietf-yang-types {
- prefix "yang";
- }
-
- import policer {
- prefix "policer";
- }
-
typedef classify-table-ref {
type leafref {
path "/vpp-classifier/classify-table/name";
diff --git a/vpp-classifier/api/src/main/yang/vpp-interface-acl@2017-03-15.yang b/vpp-classifier/api/src/main/yang/vpp-interface-acl@2017-03-15.yang
index 94bb2eda2..f1fa66dd6 100644
--- a/vpp-classifier/api/src/main/yang/vpp-interface-acl@2017-03-15.yang
+++ b/vpp-classifier/api/src/main/yang/vpp-interface-acl@2017-03-15.yang
@@ -3,11 +3,6 @@ module vpp-interface-acl {
namespace "urn:opendaylight:params:xml:ns:yang:vpp:interface:acl";
prefix "vpp-ifc-acl";
- revision "2017-03-15" {
- description
- "Initial revision of vpp-interface-acl model.";
- }
-
import ietf-interfaces {
prefix "if";
}
@@ -20,6 +15,11 @@ module vpp-interface-acl {
prefix "ext";
}
+ revision "2017-03-15" {
+ description
+ "Initial revision of vpp-interface-acl model.";
+ }
+
augment /if:interfaces/if:interface {
ext:augment-identifier "vpp-interface-acl-augmentation";
uses vpp-classifier-acl:vpp-acl-attributes;
diff --git a/vpp-classifier/api/src/main/yang/vpp-subinterface-acl@2017-03-15.yang b/vpp-classifier/api/src/main/yang/vpp-subinterface-acl@2017-03-15.yang
index 2f83adb45..53fdb24df 100644
--- a/vpp-classifier/api/src/main/yang/vpp-subinterface-acl@2017-03-15.yang
+++ b/vpp-classifier/api/src/main/yang/vpp-subinterface-acl@2017-03-15.yang
@@ -3,11 +3,6 @@ module vpp-subinterface-acl {
namespace "urn:opendaylight:params:xml:ns:yang:vpp:subinterface:acl";
prefix "vpp-subifc-acl";
- revision "2017-03-15" {
- description
- "Initial revision of vpp-subinterface-acl model.";
- }
-
import ietf-interfaces {
prefix "if";
}
@@ -24,6 +19,11 @@ module vpp-subinterface-acl {
prefix "ext";
}
+ revision "2017-03-15" {
+ description
+ "Initial revision of vpp-subinterface-acl model.";
+ }
+
augment /if:interfaces/if:interface/vpp-vlan:sub-interfaces/vpp-vlan:sub-interface {
ext:augment-identifier "vpp-subinterface-acl-augmentation";
uses vpp-classifier-acl:vpp-acl-attributes;