Code Review
/
openflowjava.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Updated experimenter model
[openflowjava.git]
/
openflow-protocol-api
/
src
/
main
/
yang
/
openflow-protocol.yang
diff --git
a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index 300dd7fef9ecd4cce5fd905cb566f9a27fa00cc7..32070d14cf900c973825c3fe47985df02d7e7e3a 100644
(file)
--- a/
openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/
openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@
-213,14
+213,11
@@
uses ofHeader;
\r
\r
leaf experimenter {
\r
uses ofHeader;
\r
\r
leaf experimenter {
\r
- type
uint32
;
\r
+ type
oft:experimenter-id
;
\r
}
\r
leaf exp_type {
\r
type uint32;
\r
}
\r
}
\r
leaf exp_type {
\r
type uint32;
\r
}
\r
- leaf data {
\r
- type binary;
\r
- }
\r
}
\r
/* Switch configuration messages. */
\r
grouping features-request {
\r
}
\r
/* Switch configuration messages. */
\r
grouping features-request {
\r
@@
-682,15
+679,7
@@
}
\r
case multipart-request-experimenter-case {
\r
container multipart-request-experimenter {
\r
}
\r
case multipart-request-experimenter-case {
\r
container multipart-request-experimenter {
\r
- leaf experimenter {
\r
- type uint32;
\r
- }
\r
- leaf exp-type {
\r
- type uint32;
\r
- }
\r
- leaf data {
\r
- type binary;
\r
- }
\r
+ // empty body - used for experimenter augmentation
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r
@@
-1057,15
+1046,7
@@
}
\r
case multipart-reply-experimenter-case {
\r
container multipart-reply-experimenter {
\r
}
\r
case multipart-reply-experimenter-case {
\r
container multipart-reply-experimenter {
\r
- leaf experimenter {
\r
- type uint32;
\r
- }
\r
- leaf exp-type {
\r
- type uint32;
\r
- }
\r
- leaf data {
\r
- type binary;
\r
- }
\r
+ // empty body - used for experimenter augmentation
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r
@@
-1212,6
+1193,9
@@
}
\r
}
\r
\r
}
\r
}
\r
\r
+ container meter-band-container {
\r
+ uses meter-band-header;
\r
+ }
\r
grouping meter-band-header {
\r
choice meter-band {
\r
case meter-band-drop-case {
\r
grouping meter-band-header {
\r
choice meter-band {
\r
case meter-band-drop-case {
\r
@@
-1230,12
+1214,6
@@
case meter-band-experimenter-case {
\r
container meter-band-experimenter {
\r
uses meter-band-commons;
\r
case meter-band-experimenter-case {
\r
container meter-band-experimenter {
\r
uses meter-band-commons;
\r
- leaf experimenter {
\r
- type uint32;
\r
- }
\r
- leaf data {
\r
- type binary;
\r
- }
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r