Fix for Bug 239

Keys in models replaced by config false (as library does not use the models as configuration)
 - rebased

Change-Id: I9e6311d912ce0fc89d8d71789366752f3764e86c
Signed-off-by: SahilShah <sahil4.s@tcs.com>
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
(cherry picked from commit f40575ad71809d618c8ff4df97886b9011f4eed8)

diff --git a/openflow-protocol-api/src/main/yang/openflow-action.yang b/openflow-protocol-api/src/main/yang/openflow-action.yang
index 950d8b0c8142de764a84f02d2247b6e3ffbb6e48..9cc200c4bca021713abc24355759d0eac6e65a72 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-action.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-action.yang
@@ -91,7 +91,7 @@
     
     grouping actions-grouping {
         list action {
-            key "type";
+            config false;
             leaf type {
                 type identityref {
                     base oft:action-base;
@@ -146,4 +146,4 @@
         base oft:action-base;
     }
 
-}
\ No newline at end of file
+}

diff --git a/openflow-protocol-api/src/main/yang/openflow-augments.yang b/openflow-protocol-api/src/main/yang/openflow-augments.yang
index 7fa157f440ed86762dea02e55e02fcb7ecf4da53..fb5e755e31ec72d456192f1c922529d7b72ab6ec 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -269,7 +269,7 @@
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
          ext:augment-identifier "next-table-related-table-feature-property";\r
          list next-table-ids {\r
-             key "table-id";\r
+             config false;\r
              leaf table-id {\r
                  type uint8;\r
              }\r

diff --git a/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang b/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
index 52da67203d731500d21e703601699adbd5d0fe39..92b94e7ac1fb581b8350d5f7f4792c0a260b2ba6 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
@@ -222,7 +222,7 @@
         grouping oxm-fields-grouping {
             list match-entries {
                 description "OXM TLV-structures (Type Length Value)";
-                key "oxm-class oxm-match-field has-mask";
+                config false;
                 leaf oxm-class {
                     type identityref {
                         base clazz;

diff --git a/openflow-protocol-api/src/main/yang/openflow-instruction.yang b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
index 91aedd00963d59d6d88f068aa370c20b7f717609..80f74a83be14b50e68af104e8bbd38ab3ae45d87 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-instruction.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
@@ -51,7 +51,7 @@
 
     grouping instructions-grouping {
         list instruction {
-            key "type";
+            config false;
             leaf type {
                 type identityref {
                     base oft:instruction-base;

diff --git a/openflow-protocol-api/src/main/yang/openflow-protocol.yang b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index 63b21d645e3e67268c58802fcd2afef399ea02b9..891a61a34e322eb809945f084678590c3b4c3718 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -128,7 +128,7 @@
 \r
         grouping table-features-properties-grouping {\r
             list table-feature-properties {\r
-                key "type";\r
+                config false;\r
                 leaf type {\r
                     type oft:table-features-prop-type;\r
                 }\r
@@ -1119,7 +1119,7 @@
             }\r
             grouping queue-property-header {\r
                 list queue-property {\r
-                    key "property";\r
+                    config false;\r
                     leaf property {\r
                         type oft:queue-properties;\r
                     }\r