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 "Fixed deserialization of IdentityRefs in Restconf URI."
[controller.git]
/
opendaylight
/
md-sal
/
model
/
model-flow-base
/
src
/
main
/
yang
/
match-types.yang
diff --git
a/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
b/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
index a2aca362e20a30662ebfd42d92b13b259409cf9f..7dcd254ad7cc751e64d30bf275a8629781f625be 100644
(file)
--- a/
opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
+++ b/
opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
@@
-19,6
+19,16
@@
module opendaylight-match-types {
type binary;
}
}
type binary;
}
}
+
+ grouping "of-metadata" {
+ leaf metadata {
+ type uint64;
+ }
+
+ leaf metadata-mask {
+ type binary;
+ }
+ }
/** Match Groupings **/
grouping "ethernet-match-fields" {
/** Match Groupings **/
grouping "ethernet-match-fields" {
@@
-40,6
+50,7
@@
module opendaylight-match-types {
mandatory true;
type l2t:ether-type; // Needs to define that as general model
}
mandatory true;
type l2t:ether-type; // Needs to define that as general model
}
+
leaf mask {
type binary;
}
leaf mask {
type binary;
}
@@
-81,29
+92,31
@@
module opendaylight-match-types {
type uint8;
}
type uint8;
}
- leaf ip-proto {
- description "IP Proto (IPv4 or IPv6 Protocol Number).";
- type inet:ip-version;
- }
- }
-
+ leaf ip-proto {
+ description "IP Proto (IPv4 or IPv6 Protocol Number).";
+ type inet:ip-version;
+
}
+ }
+
grouping "ipv4-match-fields" {
leaf ipv4-source {
description "IPv4 source address.";
type inet:ipv4-prefix;
}
grouping "ipv4-match-fields" {
leaf ipv4-source {
description "IPv4 source address.";
type inet:ipv4-prefix;
}
+
leaf ipv4-destination {
description "IPv4 destination address.";
type inet:ipv4-prefix;
}
leaf ipv4-destination {
description "IPv4 destination address.";
type inet:ipv4-prefix;
}
+
}
}
-
+
grouping "ipv6-match-fields" {
leaf ipv6-source {
description "IPv6 source address.";
type inet:ipv6-prefix;
}
grouping "ipv6-match-fields" {
leaf ipv6-source {
description "IPv6 source address.";
type inet:ipv6-prefix;
}
-
+
leaf ipv6-destination {
description "IPv6 destination address.";
type inet:ipv6-prefix;
leaf ipv6-destination {
description "IPv6 destination address.";
type inet:ipv6-prefix;
@@
-111,11
+124,17
@@
module opendaylight-match-types {
leaf ipv6-nd-target {
description "IPv6 target address for neighbour discovery message";
leaf ipv6-nd-target {
description "IPv6 target address for neighbour discovery message";
- type inet:ipv6-
prefix
;
+ type inet:ipv6-
address
;
}
}
- leaf ipv6-flabel {
- type inet:ipv6-flow-label;
+ container "ipv6-label" {
+ leaf ipv6-flabel {
+ type inet:ipv6-flow-label;
+ }
+
+ leaf flabel-mask {
+ type binary;
+ }
}
leaf ipv6-nd-sll {
}
leaf ipv6-nd-sll {
@@
-127,10
+146,16
@@
module opendaylight-match-types {
description "Link layer target address for neighbour discovery message";
type yang:mac-address;
}
description "Link layer target address for neighbour discovery message";
type yang:mac-address;
}
-
- leaf ipv6-exthdr {
- description "IPv6 Extension Header field";
- type uint16;
+
+ container "ipv6-ext-header" {
+ leaf ipv6-exthdr {
+ description "IPv6 Extension Header field";
+ type uint16;
+ }
+
+ leaf ipv6-exthdr-mask {
+ type binary;
+ }
}
}
}
}
@@
-161,11
+186,16
@@
module opendaylight-match-types {
type uint8;
}
type uint8;
}
- leaf pbb-isid {
- description "I-SID in the first PBB service instance tag";
- type uint32;
- }
-
+ container "pbb" {
+ leaf pbb-isid {
+ description "I-SID in the first PBB service instance tag";
+ type uint32;
+ }
+
+ leaf pbb-mask {
+ type binary;
+ }
+ }
}
grouping "tcp-match-fields" {
}
grouping "tcp-match-fields" {
@@
-247,13
+277,19
@@
module opendaylight-match-types {
type uint32;
}
type uint32;
}
-
leaf metadata
{
-
type uint64
;
+
container "metadata"
{
+
uses of-metadata
;
}
}
- leaf tunnel-id {
- description "Metadata associated in the logical port";
- type uint64;
+ container "tunnel" {
+ leaf tunnel-id {
+ description "Metadata associated in the logical port";
+ type uint64;
+ }
+
+ leaf tunnel-mask {
+ type binary;
+ }
}
container "ethernet-match" {
}
container "ethernet-match" {