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 "Fix bug 153: change the key container-config to ContainerConfig in the contain...
[controller.git]
/
opendaylight
/
md-sal
/
model
/
model-flow-base
/
src
/
main
/
yang
/
flow-types.yang
diff --git
a/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
b/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
index 4b50c0ee720488dfd47ead3754099fd05f3ecb10..67c6933cc7b3158d5435b2929cfae9bfaa99dad5 100644
(file)
--- a/
opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
+++ b/
opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
@@
-72,6
+72,15
@@
module opendaylight-flow-types {
bit SEND_FLOW_REM;
}
}
bit SEND_FLOW_REM;
}
}
+
+ typedef removed_reason_flags {
+ type bits {
+ bit IDLE_TIMEOUT;
+ bit HARD_TIMEOUT;
+ bit DELETE;
+ bit GROUP_DELETE;
+ }
+ }
grouping generic_flow_attributes {
leaf priority {
grouping generic_flow_attributes {
leaf priority {
@@
-185,6
+194,10
@@
module opendaylight-flow-types {
grouping flow-mod-removed {
uses generic_flow_attributes;
grouping flow-mod-removed {
uses generic_flow_attributes;
+ leaf removed_reason {
+ type removed_reason_flags;
+ }
+
leaf duration_nsec {
type uint32;
}
leaf duration_nsec {
type uint32;
}
@@
-192,22
+205,15
@@
module opendaylight-flow-types {
leaf duration_sec {
type uint32;
}
leaf duration_sec {
type uint32;
}
-
- leaf idle_timeout {
- type uint16;
- }
-
- leaf hard_timeout {
- type uint16;
- }
-
+
leaf packet_count {
type uint64;
}
leaf packet_count {
type uint64;
}
-
+
leaf byte_count {
type uint64;
}
leaf byte_count {
type uint64;
}
+
container match {
uses match:match;
}
container match {
uses match:match;
}