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 "Model PacketInReason on yang model from openflow-types.yang Signed-off-by...
[controller.git]
/
opendaylight
/
md-sal
/
model
/
model-flow-service
/
src
/
main
/
yang
/
flow-service.yang
diff --git
a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
index d6a31c30deeae87f619e157c39901ee3456f9e1a..5c68a137c3d71f8c23da9cd8da3f64d6552e2b56 100644
(file)
--- a/
opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
+++ b/
opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
@@
-51,11
+51,11
@@
module sal-flow {
rpc add-flow {
input {
rpc add-flow {
input {
+ uses tr:transaction-metadata;
leaf flow-ref {
type types:flow-ref;
}
leaf flow-ref {
type types:flow-ref;
}
- uses node-flow;
- uses tr:transaction-aware;
+ uses node-flow;
}
output {
uses tr:transaction-aware;
}
output {
uses tr:transaction-aware;
@@
-64,11
+64,11
@@
module sal-flow {
rpc remove-flow {
input {
rpc remove-flow {
input {
+ uses tr:transaction-metadata;
leaf flow-ref {
type types:flow-ref;
}
leaf flow-ref {
type types:flow-ref;
}
- uses node-flow;
- uses tr:transaction-aware;
+ uses node-flow;
}
output {
uses tr:transaction-aware;
}
output {
uses tr:transaction-aware;
@@
-77,11
+77,11
@@
module sal-flow {
rpc update-flow {
input {
rpc update-flow {
input {
+ uses tr:transaction-metadata;
leaf flow-ref {
type types:flow-ref;
}
leaf flow-ref {
type types:flow-ref;
}
- uses flow-update;
- uses tr:transaction-aware;
+ uses flow-update;
}
output {
uses tr:transaction-aware;
}
output {
uses tr:transaction-aware;
@@
-89,6
+89,7
@@
module sal-flow {
}
notification flow-added {
}
notification flow-added {
+ uses tr:transaction-metadata;
leaf flow-ref {
type types:flow-ref;
}
leaf flow-ref {
type types:flow-ref;
}
@@
-97,15
+98,16
@@
module sal-flow {
}
notification flow-updated {
}
notification flow-updated {
+ uses tr:transaction-metadata;
leaf flow-ref {
type types:flow-ref;
}
uses node-flow;
leaf flow-ref {
type types:flow-ref;
}
uses node-flow;
- uses tr:transaction-aware;
-
+ uses tr:transaction-aware;
}
notification flow-removed {
}
notification flow-removed {
+ uses tr:transaction-metadata;
leaf flow-ref {
type types:flow-ref;
}
leaf flow-ref {
type types:flow-ref;
}
@@
-120,6
+122,7
@@
module sal-flow {
notification node-error-notification {
uses error:error-message;
uses tr:transaction-aware;
notification node-error-notification {
uses error:error-message;
uses tr:transaction-aware;
+ uses tr:transaction-metadata;
}
notification node-experimenter-error-notification {
}
notification node-experimenter-error-notification {