Merge "Removed enumeration ALL from FlowWildCardsV10"

[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 da945f8feee5d4ed9d8c8fc91960c904a4eda4ca..bbd61a9e7cbc46235a0474267bdc68e661594d8b 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-instruction.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
@@ -5,9 +5,9 @@ module openflow-instruction {
     import openflow-types { prefix oft; }
 
     revision "2013-07-31" {
-       // description "Initial model";
+       // description "OpenFlow 1.3 - instruction model";
     }
-    /*
+
     identity goto_table {
         //description " Setup the next table in the lookup pipeline";
         base oft:instruction;
@@ -36,48 +36,20 @@ module openflow-instruction {
         description "Experimenter instruction";
         base oft:instruction;
     }
-    */
-    // Structures
 
-    grouping goto-table {
-        description " Setup the next table in the lookup pipeline";
-        leaf table {
-            type oft:table-id; // 
-        }
-    }
-    grouping write-metadata {
-        description " Setup the metadata field for use later in     pipeline";
-        leaf metadata {
-            type oft:metadata;
-        }
-        leaf mask {
-            type oft:metadata;
-        }
+    container instruction-container {
+        uses instructions;
     }
-    grouping actions {
-        leaf type {
-            type enumeration {
-                enum write {
-                    description " Write the action(s) onto the datapath action set";            
-                }
-                enum apply {
-                    description " Applies the action(s) immediately";
-                }
-                enum clear {
-                    description " Clears all actions from the datapath action set";
+
+    grouping instructions {
+        list instructions {
+            key "type";
+            leaf type {
+                type identityref {
+                    base oft:instruction;
                 }
             }
         }
-        list action {
-            // TBD
-        }
-    }
-    
-    grouping meter {
-        description " Apply meter (rate limiter)";
-        leaf meter-id {
-            type oft:meter-id;
-        }
     }
 
 }
\ No newline at end of file