Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Refactor Subnet.isSubnetOf - reduce number of 'if' statements. Added unitests."
[controller.git]
/
opendaylight
/
md-sal
/
model
/
model-flow-base
/
src
/
main
/
yang
/
meter-types.yang
diff --git
a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
b/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
index 0548890a00bcd87637d564002c7754780fa6821c..d84b2f08511f466848886cb75aa4f418341d5563 100644
(file)
--- a/
opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
+++ b/
opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
@@
-11,7
+11,10
@@
module opendaylight-meter-types {
}
typedef meter-id {
}
typedef meter-id {
- type uint32;
+ type uint32;
+ }
+ typedef band-id {
+ type uint32;
}
typedef meter-flags {
}
typedef meter-flags {
@@
-109,6
+112,10
@@
module opendaylight-meter-types {
}
}
}
}
+ typedef meter-ref {
+ type instance-identifier;
+ }
+
grouping meter {
leaf flags {
grouping meter {
leaf flags {
@@
-117,11
+124,12
@@
module opendaylight-meter-types {
leaf meter-id {
type meter-id;
leaf meter-id {
type meter-id;
- }
+ }
- leaf
install
{
+ leaf
barrier
{
type boolean;
}
type boolean;
}
+
leaf meter-name {
type string;
}
leaf meter-name {
type string;
}
@@
-132,9
+140,9
@@
module opendaylight-meter-types {
container meter-band-headers {
list meter-band-header {
container meter-band-headers {
list meter-band-header {
- key "
order
";
- leaf
order
{
- type
int32
;
+ key "
band-id
";
+ leaf
band-id
{
+ type
band-id
;
}
container meter-band-types {
}
container meter-band-types {
@@
-158,7
+166,7
@@
module opendaylight-meter-types {
grouping meter-statistics {
leaf meter-id {
grouping meter-statistics {
leaf meter-id {
- type
int32
;
+ type
meter-id
;
}
leaf flow-count {
}
leaf flow-count {
@@
-184,9
+192,9
@@
module opendaylight-meter-types {
container meter-band-stats {
list band-stat {
container meter-band-stats {
list band-stat {
- key "
order
";
- leaf
order
{
- type
int32
;
+ key "
band-id
";
+ leaf
band-id
{
+ type
band-id
;
}
leaf packet-band-count {
}
leaf packet-band-count {
@@
-230,30
+238,22
@@
module opendaylight-meter-types {
grouping meter-stats-config-request {
list meter-stats {
key "meter-id";
grouping meter-stats-config-request {
list meter-stats {
key "meter-id";
-
leaf meter-id {
leaf meter-id {
- type
int32
;
+ type
meter-id
;
}
}
}
grouping meter-statistics-reply {
list meter-stats {
}
}
}
grouping meter-statistics-reply {
list meter-stats {
- key "meter-stats-order";
- leaf meter-stats-order {
- type int32;
- }
+ key "meter-id";
uses meter-statistics;
}
}
grouping meter-config-stats-reply {
list meter-config-stats {
uses meter-statistics;
}
}
grouping meter-config-stats-reply {
list meter-config-stats {
- key "meter-config-order";
- leaf meter-config-order {
- type int32;
- }
-
+ key "meter-id";
uses meter;
}
}
uses meter;
}
}