X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-api%2Fsrc%2Fmain%2Fyang%2Fopenflow-augments.yang;h=a62f91ac0ffc026a39ba5cbe02358c268055e6ea;hb=0d9c30aa4c3e66f92eca0a867d3cf678b07770ca;hp=75c6590b96c6e6d032f6a4d9d029394a105d23ad;hpb=156b1d174392438b48a76fd82ad3f84f618e8042;p=openflowjava.git diff --git a/openflow-protocol-api/src/main/yang/openflow-augments.yang b/openflow-protocol-api/src/main/yang/openflow-augments.yang index 75c6590b..a62f91ac 100644 --- a/openflow-protocol-api/src/main/yang/openflow-augments.yang +++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang @@ -77,12 +77,6 @@ module openflow-augments { type uint8; } } - augment "/oxm:oxm-container/oxm:match-entries" { - ext:augment-identifier "ipv4-prefix-match-entry"; - leaf ipv4-prefix { - type inet:ipv4-prefix; - } - } augment "/oxm:oxm-container/oxm:match-entries" { ext:augment-identifier "port-match-entry"; leaf port { @@ -107,12 +101,6 @@ module openflow-augments { type uint16; } } - augment "/oxm:oxm-container/oxm:match-entries" { - ext:augment-identifier "ipv6-prefix-match-entry"; - leaf ipv6-prefix { - type inet:ipv6-prefix; - } - } augment "/oxm:oxm-container/oxm:match-entries" { ext:augment-identifier "ipv6-flabel-match-entry"; leaf ipv6-flabel { @@ -137,6 +125,12 @@ module openflow-augments { type inet:ipv6-address; } } + augment "/oxm:oxm-container/oxm:match-entries" { + ext:augment-identifier "ipv4-address-match-entry"; + leaf ipv4-address { + type inet:ipv4-address; + } + } augment "/oxm:oxm-container/oxm:match-entries" { ext:augment-identifier "mpls-label-match-entry"; leaf mpls-label { @@ -209,7 +203,7 @@ module openflow-augments { augment "/ofaction:actions-container/ofaction:action" { ext:augment-identifier "port-action"; leaf port { - type oft:any-port-number; + type oft:port-number; } } augment "/ofaction:actions-container/ofaction:action" {