Match and actions (de)serialization + fix

[openflowjava.git] / openflow-protocol-api / src / main / yang / openflow-augments.yang

diff --git a/openflow-protocol-api/src/main/yang/openflow-augments.yang b/openflow-protocol-api/src/main/yang/openflow-augments.yang
index 75c6590b96c6e6d032f6a4d9d029394a105d23ad..a62f91ac0ffc026a39ba5cbe02358c268055e6ea 100644 (file)
--- 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;\r
          }\r
      }\r
-     augment "/oxm:oxm-container/oxm:match-entries" {\r
-         ext:augment-identifier "ipv4-prefix-match-entry";\r
-         leaf ipv4-prefix {\r
-             type inet:ipv4-prefix;\r
-         }\r
-     }\r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          ext:augment-identifier "port-match-entry";\r
          leaf port {\r
@@ -107,12 +101,6 @@ module openflow-augments {
              type uint16;\r
          }\r
      }\r
-     augment "/oxm:oxm-container/oxm:match-entries" {\r
-         ext:augment-identifier "ipv6-prefix-match-entry";\r
-         leaf ipv6-prefix {\r
-             type inet:ipv6-prefix;\r
-         }\r
-     }\r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          ext:augment-identifier "ipv6-flabel-match-entry";\r
          leaf ipv6-flabel {\r
@@ -137,6 +125,12 @@ module openflow-augments {
              type inet:ipv6-address;\r
          }\r
      }\r
+     augment "/oxm:oxm-container/oxm:match-entries" {\r
+         ext:augment-identifier "ipv4-address-match-entry";\r
+         leaf ipv4-address {\r
+             type inet:ipv4-address;\r
+         }\r
+     }\r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          ext:augment-identifier "mpls-label-match-entry";\r
          leaf mpls-label {\r
@@ -209,7 +203,7 @@ module openflow-augments {
      augment "/ofaction:actions-container/ofaction:action" {\r
          ext:augment-identifier "port-action";\r
          leaf port {\r
-             type oft:any-port-number;\r
+             type oft:port-number;\r
          }\r
      }\r
      augment "/ofaction:actions-container/ofaction:action" {\r