From 4e1850419d83c2da11c844c307deab65acb5b087 Mon Sep 17 00:00:00 2001
From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Mon, 17 Feb 2014 14:59:15 +0100
Subject: [PATCH] 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)
---
 openflow-protocol-api/src/main/yang/openflow-action.yang      | 4 ++--
 openflow-protocol-api/src/main/yang/openflow-augments.yang    | 2 +-
 .../src/main/yang/openflow-extensible-match.yang              | 2 +-
 openflow-protocol-api/src/main/yang/openflow-instruction.yang | 2 +-
 openflow-protocol-api/src/main/yang/openflow-protocol.yang    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openflow-protocol-api/src/main/yang/openflow-action.yang b/openflow-protocol-api/src/main/yang/openflow-action.yang
index 950d8b0c..9cc200c4 100644
--- 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 7fa157f4..fb5e755e 100644
--- 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" {
          ext:augment-identifier "next-table-related-table-feature-property";
          list next-table-ids {
-             key "table-id";
+             config false;
              leaf table-id {
                  type uint8;
              }
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 52da6720..92b94e7a 100644
--- 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 91aedd00..80f74a83 100644
--- 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 63b21d64..891a61a3 100644
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -128,7 +128,7 @@
 
         grouping table-features-properties-grouping {
             list table-feature-properties {
-                key "type";
+                config false;
                 leaf type {
                     type oft:table-features-prop-type;
                 }
@@ -1119,7 +1119,7 @@
             }
             grouping queue-property-header {
                 list queue-property {
-                    key "property";
+                    config false;
                     leaf property {
                         type oft:queue-properties;
                     }
-- 
2.36.6