Remove trailing whitespace

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

diff --git a/openflow-protocol-api/src/main/yang/openflow-instruction.yang b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
index 6e7c8a299c6bc06296fdce7dcbc2c664c9d7f968..671556e104bc83a4e2503d31a2e4c3f62391049f 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-instruction.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
- 
+
  module openflow-instruction {
     namespace "urn:opendaylight:openflow:common:instruction";
     prefix "ofinstruction";
@@ -18,43 +18,43 @@
 
     identity goto_table {
         description " Setup the next table in the lookup pipeline";
-        base oft:instruction;
+        base oft:instruction-base;
     }
     identity write_metadata {
         description " Setup the metadata field for use later in     pipeline";
-        base oft:instruction;
+        base oft:instruction-base;
     }
     identity write_actions {
         description " Write the action(s) onto the datapath action set";
-        base oft:instruction;
+        base oft:instruction-base;
     }
     identity apply_actions {
         description " Applies the action(s) immediately";
-        base oft:instruction;
+        base oft:instruction-base;
     }
     identity clear_actions {
         description " Clears all actions from the datapath action set";
-        base oft:instruction;
+        base oft:instruction-base;
     }
     identity meter {
         description " Apply meter (rate limiter)";
-        base oft:instruction;
+        base oft:instruction-base;
     }
     identity experimenter {
         description "Experimenter instruction";
-        base oft:instruction;
+        base oft:instruction-base;
     }
 
     container instruction-container {
-        uses instructions;
+        uses instructions-grouping;
     }
 
-    grouping instructions {
-        list instructions {
-            key "type";
+    grouping instructions-grouping {
+        list instruction {
+            config false;
             leaf type {
                 type identityref {
-                    base oft:instruction;
+                    base oft:instruction-base;
                 }
             }
         }