Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change getIsOnlineFuture() return type
[openflowplugin.git]
/
model
/
model-flow-base
/
src
/
main
/
yang
/
opendaylight-group-types.yang
diff --git
a/model/model-flow-base/src/main/yang/opendaylight-group-types.yang
b/model/model-flow-base/src/main/yang/opendaylight-group-types.yang
index 66538605bfda0463676b787bdb4ac0c2edb76383..b2d56304e0d32d30cbe60f6a25d3b608935aa26e 100644
(file)
--- a/
model/model-flow-base/src/main/yang/opendaylight-group-types.yang
+++ b/
model/model-flow-base/src/main/yang/opendaylight-group-types.yang
@@
-2,8
+2,10
@@
module opendaylight-group-types {
namespace "urn:opendaylight:group:types";
prefix group;
namespace "urn:opendaylight:group:types";
prefix group;
- import ietf-yang-types {prefix yang; revision-date "201
0-09-24";}
+ import ietf-yang-types {prefix yang; revision-date "201
3-07-15";}
import opendaylight-action-types {prefix action;}
import opendaylight-action-types {prefix action;}
+ import openflow-protocol { prefix ofproto; revision-date "2013-07-31"; }
+ import openflow-types { prefix oft; revision-date "2013-07-31"; }
revision "2013-10-18" {
description "Initial revision of group service";
revision "2013-10-18" {
description "Initial revision of group service";
@@
-12,141
+14,141
@@
module opendaylight-group-types {
typedef group-id {
type uint32;
}
typedef group-id {
type uint32;
}
-
+
typedef bucket-id {
typedef bucket-id {
- type uint32;
+
type uint32;
}
}
-
- typedef group-types {
+
+ typedef group-types {
type enumeration {
enum group-all;
enum group-select;
enum group-indirect;
enum group-ff;
type enumeration {
enum group-all;
enum group-select;
enum group-indirect;
enum group-ff;
- }
+ }
}
}
-
- typedef group-capabilities {
+
+ typedef group-capabilities {
type enumeration {
enum select-weight;
enum select-liveness;
enum chaining;
enum chaining-checks;
type enumeration {
enum select-weight;
enum select-liveness;
enum chaining;
enum chaining-checks;
- }
+ }
}
}
-
+
identity group-type {
identity group-type {
- description "Base identity for all the available group types";
+ description "Base identity for all the available group types";
}
}
-
+
identity group-all {
identity group-all {
- base group-type;
- description "All (multicast/broadcast) group";
+
base group-type;
+
description "All (multicast/broadcast) group";
}
}
-
+
identity group-select {
identity group-select {
- base group-type;
- description "Select group";
+
base group-type;
+
description "Select group";
}
}
-
+
identity group-indirect {
identity group-indirect {
- base group-type;
- description "Indirect group";
+
base group-type;
+
description "Indirect group";
}
}
-
+
identity group-ff {
identity group-ff {
- base group-type;
- description "Fast failover group";
+
base group-type;
+
description "Fast failover group";
}
}
-
+
identity group-capability {
identity group-capability {
- description "Base identity for all the supported group capabilities";
+
description "Base identity for all the supported group capabilities";
}
}
-
+
identity select-weight{
identity select-weight{
- base group-capability;
- description "Support weight for select groups";
+
base group-capability;
+
description "Support weight for select groups";
}
identity select-liveness{
}
identity select-liveness{
- base group-capability;
- description "Support liveness for select groups";
+
base group-capability;
+
description "Support liveness for select groups";
}
identity chaining{
}
identity chaining{
- base group-capability;
- description "Support chaining groups";
+
base group-capability;
+
description "Support chaining groups";
}
identity chaining-checks{
}
identity chaining-checks{
- base group-capability;
- description "Check chaining for loops and delete";
+
base group-capability;
+
description "Check chaining for loops and delete";
}
}
-
+
typedef group-ref {
type instance-identifier;
}
typedef group-ref {
type instance-identifier;
}
-
+
grouping group {
grouping group {
-
+
leaf group-type {
type group-types;
}
leaf group-type {
type group-types;
}
-
+
leaf group-id {
type group-id;
}
leaf group-id {
type group-id;
}
-
+
leaf group-name {
type string;
}
leaf group-name {
type string;
}
-
+
leaf container-name {
leaf container-name {
- type string;
+ type string;
}
}
-
+
leaf barrier {
leaf barrier {
- type boolean;
- }
-
+ type boolean;
+ }
+
container buckets {
list bucket {
key "bucket-id";
leaf bucket-id {
type bucket-id;
}
container buckets {
list bucket {
key "bucket-id";
leaf bucket-id {
type bucket-id;
}
-
+
leaf weight {
type uint16;
}
leaf weight {
type uint16;
}
-
+
leaf watch_port {
type uint32;
}
leaf watch_port {
type uint32;
}
-
+
leaf watch_group {
type uint32;
}
leaf watch_group {
type uint32;
}
-
+
uses action:action-list;
}
}
}
uses action:action-list;
}
}
}
-
+
grouping group-statistics {
grouping group-statistics {
-
+
leaf group-id {
type group-id;
}
leaf group-id {
type group-id;
}
-
+
leaf ref-count {
type yang:counter32;
}
leaf ref-count {
type yang:counter32;
}
-
+
leaf packet-count {
type yang:counter64;
leaf packet-count {
type yang:counter64;
- }
-
+ }
+
leaf byte-count {
type yang:counter64;
}
leaf byte-count {
type yang:counter64;
}
@@
-159,86
+161,88
@@
module opendaylight-group-types {
type yang:counter32;
}
}
type yang:counter32;
}
}
-
+
container buckets {
list bucket-counter {
key "bucket-id";
leaf bucket-id {
type bucket-id;
}
container buckets {
list bucket-counter {
key "bucket-id";
leaf bucket-id {
type bucket-id;
}
-
+
leaf packet-count {
type yang:counter64;
leaf packet-count {
type yang:counter64;
- }
-
+ }
+
leaf byte-count {
type yang:counter64;
}
}
leaf byte-count {
type yang:counter64;
}
}
- }
+ }
}
grouping group-features {
}
grouping group-features {
-
- leaf-list group-types-supported {
-
type identityref {
-
base group-type;
-
}
-
}
-
- leaf-list group-capabilities-supported {
-
type identityref {
-
base group-capability;
-
}
-
}
+
+
leaf-list group-types-supported {
+ type identityref {
+ base group-type;
+ }
+ }
+
+
leaf-list group-capabilities-supported {
+ type identityref {
+ base group-capability;
+ }
+ }
leaf-list max-groups {
type uint32;
description "Maximum number of groups for each type";
max-elements 4;
leaf-list max-groups {
type uint32;
description "Maximum number of groups for each type";
max-elements 4;
+ ordered-by user;
}
}
-
+
leaf-list actions {
type uint32;
description "Bitmap number OFPAT_* that are supported";
max-elements 4;
leaf-list actions {
type uint32;
description "Bitmap number OFPAT_* that are supported";
max-elements 4;
+ ordered-by user;
}
}
}
}
-
+
grouping group-statistics-request {
list group-stats {
grouping group-statistics-request {
list group-stats {
- key "group-id";
+ key "group-id";
leaf group-id {
type group-id;
leaf group-id {
type group-id;
- }
+ }
}
}
}
}
-
-
+
+
grouping group-statistics-reply {
grouping group-statistics-reply {
-
+
list group-stats {
key "group-id";
uses group-statistics;
}
}
list group-stats {
key "group-id";
uses group-statistics;
}
}
-
+
grouping group-desc-stats-reply {
grouping group-desc-stats-reply {
-
+
list group-desc-stats {
list group-desc-stats {
- key "group-id";
+ key "group-id";
uses group;
}
}
uses group;
}
}
-
+
grouping group-features-reply {
grouping group-features-reply {
- uses group-features;
+
uses group-features;
}
}
-
+
grouping groups {
list group {
grouping groups {
list group {
- key "group-id";
-
+ key "group-id";
+
uses group;
}
uses group;
}
@@
-249,5
+253,13
@@
module opendaylight-group-types {
uses group;
}
}
uses group;
}
}
-
+
+ container group-message {
+ uses group;
+ uses ofproto:ofHeader;
+
+ leaf command {
+ type oft:group-mod-command;
+ }
+ }
}
}